禅道BUG修改-云服务器配置

inventory-dao/src/main/java/com/rzyc/mapper/check/BookEntHTMapper.java

@@ -159,7 +159,8 @@ public interface BookEntHTMapper {
                                     @Param("state")String state,
                                     @Param("areaCode") String areaCode,
                                     @Param("page")int page,
-                                    @Param("pageSize")int pageSize);
+                                    @Param("pageSize")int pageSize,
+                                    @Param("streetCode")String streetCode);
 
     BookEntHT selectDangerDetail(String id);
 

inventory-dao/src/main/java/com/rzyc/mapper/ent/EntUserMapper.java

@@ -65,6 +65,15 @@ public interface EntUserMapper extends BaseMapper<EntUser> {
      * */
     EntUser validAccount(@Param("account") String account,@Param("entUserId")String entUserId);
 
+    /**
+     * 验证用户账号
+     * @param account 电话
+     * @param entUserId 用户id
+     * @param enterpriseId 企业id
+     * @return int 成功或失败
+     * */
+    EntUser validAccountByEntId(@Param("account") String account,@Param("entUserId")String entUserId,@Param("enterpriseId")String enterpriseId);
+
     /**
      * 验证用户电话和名字
      * @param name 名字

inventory-dao/src/main/resources/mapper/EntDeviceInsCycleMapper.xml

@@ -45,9 +45,12 @@
     <select id="checkDeviceInspectionRecord" resultMap="BaseResultMap">
         select edic.*,eir.ins_record_date from ent_device_ins_cycle edic
             left join
-            (select * from ent_ins_record  order by create_time desc limit 1)as eir on edic.inspection_id = eir.cycle_id
+            (select * from ent_ins_record  order by create_time desc limit 1)as eir on edic.inspection_id = eir.cycle_id  and  eir.del_state = 1
             left join ent_device ed on edic.device_id = ed.device_id and overdue_inspection = 1
-        where edic.next_time_inspection = #{date}
+            where 1=1
+            <if test="null != date">
+              and  edic.next_time_inspection = #{date}
+            </if>
     </select>
 
     <select id="selectByDeviceId" resultMap="BaseResultMap">

inventory-dao/src/main/resources/mapper/EntUserCredentialMapper.xml

@@ -25,9 +25,12 @@
     <select id="selectEntUserCredential" resultMap="BaseResultMap">
         select euc.* from ent_user_credential euc
         <if test="null != enterpriseId and '' != enterpriseId">
-            left join ent_user eu on euc.ent_user_id = eu.ent_user_id and eu.enterprise_id  = #{enterpriseId}
+            left join ent_user eu on euc.ent_user_id = eu.ent_user_id
         </if>
         where 1=1
+        <if test="null != enterpriseId and '' != enterpriseId">
+             and eu.enterprise_id  = #{enterpriseId}
+        </if>
          <if test="null != entUserId and '' != entUserId">
              and euc.ent_user_id = #{entUserId}
          </if>

inventory-dao/src/main/resources/mapper/ent/EntUserMapper.xml

@@ -139,6 +139,16 @@
         </if>
     </select>
 
+    <select id="validAccountByEntId" resultMap="BaseResultMap">
+        select ent_user_id,name,mobile,password,post_id from ent_user where account = #{account}
+        <if test="null != entUserId and '' != entUserId">
+            and ent_user_id != #{entUserId}
+        </if>
+        <if test="null != enterpriseId and '' != enterpriseId">
+            and enterprise_id != #{enterpriseId}
+        </if>
+    </select>
+
     <select id="validName" resultMap="BaseResultMap">
         select ent_user_id, name, mobile
         from ent_user

inventory-ent/src/main/java/com/rzyc/advice/SaticScheduleTask.java

@@ -21,7 +21,7 @@ public class SaticScheduleTask {
     }
 
 
-    @Scheduled(cron = "0 */4 *  * * ?")
+    @Scheduled(cron = "0 2 */1 * * ?")
     private void deviceInspectionCycleCheck() {
         taskService.deviceInspectionCycleCheck();
     }

inventory-ent/src/main/java/com/rzyc/controller/EnterpriseEquipmentController.java

@@ -503,7 +503,7 @@ public class EnterpriseEquipmentController extends BaseController {
     @ApiOperation(value = "企业设备过期列表", notes = "企业设备过期列表")
     @GetMapping(value = "/entDeviceOverdue")
     @PreAuthorize("hasAnyAuthority('entDeviceOverdue')")
-    @MethodAnnotation(authorizations = {"entDeviceOverdue"},name = "应急资源删除")
+    @MethodAnnotation(authorizations = {"entDeviceOverdue"},name = "企业设备过期列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "enterpriseId", value = "企业id",required = true, dataType = "string"),
     })

inventory-ent/src/main/java/com/rzyc/service/AssignmentTaskThread.java

@@ -128,12 +128,15 @@ public class AssignmentTaskThread  implements Runnable{
 
     private SingleResult insertListAndTask(AddOrUpdateEntUserPostListDto addOrUpdateEntUserPostTaskDto,String createByUserId) throws Exception {
         EntPostList entPostList = new EntPostList();
+        Calendar calendar = Calendar.getInstance();
         SingleResult singleResult = new SingleResult();
         BeanUtils.copyProperties(addOrUpdateEntUserPostTaskDto,entPostList);
         entPostList.setCreateBy(createByUserId);
         entPostList.setCreateTime(new Date());
         entPostList.setDelState(DelState.NOT_DEL.getState());
+        //默认当前年
         entPostList.setPostListId(RandomNumber.getUUid());
+        entPostList.setYearNum(calendar.get(Calendar.YEAR));
         int  result = entPostListMapper.insert(entPostList);
         if (result != 1 ){
             singleResult.setCode(Code.ERROR.getCode());

inventory-ent/src/main/java/com/rzyc/service/DeviceInspectionCycle.java

@@ -25,17 +25,17 @@ public class DeviceInspectionCycle implements Runnable{
 
     @Override
     public void run() {
-        DateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd");
+        List<EntDeviceInsCycle> list = entDeviceInsCycleMapper.checkDeviceInspectionRecord(null);
-        Calendar calendar=Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY,-24);
-        String yesterdayDate=dateFormat.format(calendar.getTime());
-        List<EntDeviceInsCycle> list = entDeviceInsCycleMapper.checkDeviceInspectionRecord(yesterdayDate);
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         for (EntDeviceInsCycle e:list) {
-            String date1 = simpleDateFormat.format(e.getNextTimeInspection());
+            if (null != e.getNextTimeInspection() && null != e.getInsRecordDate()){
-            String date2 = simpleDateFormat.format(e.getInsRecordDate());
+                String date1 = simpleDateFormat.format(e.getNextTimeInspection());
-            if (!date1.equals(date2)){
+                String date2 = simpleDateFormat.format(e.getInsRecordDate());
-                //2为超期
+                if (!date1.equals(date2)){
+                    //2为超期
+                    entDeviceMapper.updateOverdueInspection(e.getDeviceId(),2);
+                }
+            }else {
                 entDeviceMapper.updateOverdueInspection(e.getDeviceId(),2);
             }
         }

inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java

@@ -526,7 +526,7 @@ public class PcBusinessService extends BaseController {
         Integer result = 0;
         EntDeviceInsCycle entDeviceInsCycle = new EntDeviceInsCycle();
         BeanUtils.copyProperties(addOrUpdateDeviceInspectionCycleDto,entDeviceInsCycle);
-        Date nextTime = calculationDays(addOrUpdateDeviceInspectionCycleDto.getInspectionCycle());
+        Date nextTime = calculationDays(addOrUpdateDeviceInspectionCycleDto.getInspectionCycle(),addOrUpdateDeviceInspectionCycleDto.getLastInspectionDate());
         entDeviceInsCycle.setNextTimeInspection(nextTime);
         if (null != addOrUpdateDeviceInspectionCycleDto && null != addOrUpdateDeviceInspectionCycleDto.getInspectionId()){
             entDeviceInsCycle.setModifyBy(getUserId());
@@ -1067,8 +1067,9 @@ public class PcBusinessService extends BaseController {
     }
 
     //向后加时间
-    private Date calculationDays(Integer day){
+    private Date calculationDays(Integer day,Date lastCheckTime){
         Calendar cal = Calendar.getInstance();
+        cal.setTime(lastCheckTime);
         int amount = day;
         cal.add(Calendar.DATE, amount);
         Date date  = cal.getTime();
@@ -1245,7 +1246,7 @@ public class PcBusinessService extends BaseController {
         //判断任务是否完成，完成则修改为完成状态
         if (null != entPostListDetailDto.getEntPostTaskId()){
             EntPostTask entPostTask = entPostTaskMapper.verifyCompletion(entPostListDetailDto.getEntPostTaskId());
-            if (entPostTask.getNumberOfDutyPerformance() > entPostTask.getFrequency()){
+            if (entPostTask.getNumberOfDutyPerformance() >= entPostTask.getFrequency()){
                 entPostTaskMapper.updateTaskState(entPostListDetailDto.getEntPostTaskId());
                 entPostListMapper.updateFishState(entPostListDetailDto.getListFactorId(),2);
             }
@@ -1341,7 +1342,7 @@ public class PcBusinessService extends BaseController {
     public SingleResult deleteEntPost(String postId){
         SingleResult singleResult = new SingleResult();
         Integer result = entPostMapper.deleteEntPost(DelState.DELETE.getState(),postId);
-        if (result <= 1){
+        if (result < 1){
             singleResult.setCode(Code.ERROR.getCode());
             singleResult.setMessage(Message.ERROR);
         }

inventory-ent/src/main/resources/application-dev.yml

@@ -38,7 +38,7 @@ spring:
   #数据库
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://121.40.106.103:3306/inventory_db?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&
+    url: jdbc:mysql://121.40.106.103:3306/inventory_copy?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&
     username: rzyc
     password: ENC(FDlRK2MAcJBMF7UBHBJPLGzRkpWQ4T6dgYP2bDnTodQ=)
     tomcat:

inventory-ent/src/main/resources/application-prod.yml

@@ -43,7 +43,7 @@ spring:
   #数据库
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://121.40.106.103:3306/inventory_db?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false
+    url: jdbc:mysql://121.40.106.103:3306/inventory_copy?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false
     username: rzyc
     password: ENC(FDlRK2MAcJBMF7UBHBJPLGzRkpWQ4T6dgYP2bDnTodQ=)
     tomcat:

inventory-ent/src/main/resources/application-yun.yml

@@ -0,0 +1,111 @@
+server:
+  port: 8019
+
+spring:
+  redis:
+    host: 172.27.181.247
+    Auth: ENC(788KvYFV7cHJUQ31ckyvjTpUQT2sw73E)
+    #    进入哨兵项目-这个端口就不用了，除非是单体
+    port: 8011
+#    sentinel:
+#      master: mymaster
+#      nodes: 172.27.181.247:26379,172.27.181.247:26380,172.27.181.247:26381
+    lettuce:
+      pool:
+        max-active: 8
+        max-idle: 8
+        min-idle: 0
+        max-wait: 100
+      shutdown-timeout: 50000
+  servlet:
+    multipart:
+      enabled: true
+      max-file-size: 50MB
+      max-request-size: 100MB
+  mvc:
+    view:
+      prefix: classpath:/templates/
+      suffix: .html
+  devtools:
+    restart:
+      enabled: true
+  thymeleaf:
+    cache: false
+  resources:
+    cache:
+      period: 0
+  application:
+    name: log
+
+
+
+
+  #数据库
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://172.27.181.52:3306/inventory_db?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false
+    username: ENC(QE4vB4KHgFwuqi42wTs27w==)
+    password: ENC(9mRKdl9UCE8tkEsoO376nx5rCx58Htk1)
+    tomcat:
+      max-active: 10
+      min-idle: 10
+      initial-size: 2
+    hikari:
+      minimum-idle: 3
+      maximum-pool-size: 10
+      max-lifetime: 30000
+      connection-test-query: SELECT 1
+  jackson:
+    #设置json转时间时区为东八区
+    time-zone: GMT+8
+
+#mybatis 配置文件
+mybatis:
+  type-aliases-package: com.rzyc.model
+  mapper-locations: mapper/**/*.xml
+  config-location: classpath:mybatis-config.xml
+
+#打印sql
+logging:
+  level:
+    com.rzyc.mapper: debug
+
+
+#文件上传的配置
+onstants:
+  #上传文件存放地址
+  file_location: /static/rzyc/resource/inventory/uploadFile/
+  #上传文件公共地址
+  file_header: /static/resource/inventory/uploadFile/
+  #上传文件基础路径
+  service_file_header: http://172.27.181.247/
+  #父级地区id
+  superior_org_code: 512000
+  #动态详情基础地址
+  html_header: http://172.27.181.247:8018/
+  #logourl
+  logo_url: http://172.27.181.247/static/resource/inventory/citysafe_logo.png
+  #政府端帮助文档url
+  help_url: http://172.27.181.247:8018/appGovHelp
+  #企业端帮助文档url
+  ent_help_url: http://172.27.181.247:8018/appGovHelp
+  #行业部门id
+  unit_id: 5bd164aa-dd43-45e3-a5a2-649bb2fd9fb9
+  #镇街功能区
+  area_unit_id: 920184e5-0cd8-4ef5-bdc7-d992ac4f1c17
+  #验证码key
+  generate_code_key: GENERATE_CODE_KEY
+  #企业账号默认密码
+  default_passwd: csaq512000
+  #公示牌
+  gsp_path: /static/rzyc/resource/inventory/gsp.xlsx
+  #zip下载地址
+  zip_path: /static/rzyc/resource/inventory/zip
+  #导出word模板路径
+  word_tmp: /static/rzyc/resource/inventory/wordtmp
+
+
+#加密
+jasypt:
+  encryptor:
+    password: gzQdz

inventory-gov/src/main/java/com/rzyc/controller/BaseController.java

@@ -560,6 +560,14 @@ public class BaseController {
     @Autowired
     protected SysUnitTradeMapper sysUnitTradeMapper;
 
+    //企业设备
+    @Autowired
+    protected EntDeviceMapper entDeviceMapper;
+
+    //企业人员证照
+    @Autowired
+    protected  EntUserCredentialMapper entUserCredentialMapper;
+
 
     /**
      * 岗位不需要的字符串

inventory-gov/src/main/java/com/rzyc/controller/ExportContorller.java

@@ -27,10 +27,7 @@ import com.rzyc.model.ent.SysEnterprise;
 import com.rzyc.model.organization.Organization;
 import com.rzyc.model.oth.*;
 import com.rzyc.model.user.SysUser;
-import io.swagger.annotations.Api;
+import io.swagger.annotations.*;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.annotation.Validated;
@@ -528,12 +525,16 @@ public class ExportContorller extends com.rzyc.controller.BaseController {
      * @throws Exception
      */
     @ApiOperation(value = "导出企业二维码", notes = "导出企业二维码")
-    @GetMapping(value = "/exportQrcode/{userId}")
+    @GetMapping(value = "/exportQrcode/{orgCode}")
     @ResponseBody
-    public void exportQrcode(@PathVariable String userId,HttpServletResponse response)throws Exception{
+    public void exportQrcode(@PathVariable String orgCode, String companyName,
+                              String riskLevel, String inherentRiskStr,
+                              String baseinclassid,
+                             HttpServletResponse response)throws Exception{
 
         String time = DateUtils.getNowDateTimeStr("yyyyMMddHHmmss");
 
+        String userId = getUserId();
 
         //正式服
 //        String baseFolder = "/usr/local/app/resource/zip";
@@ -554,10 +555,20 @@ public class ExportContorller extends com.rzyc.controller.BaseController {
         //服务器
         String fileHeader = constantsConfigure.getServiceFileHeader();
 
+        //用户的归属地
         String areaCode = getUserArea(userId);
 
+        List<Integer> inherentRisks = new ArrayList<>();
 
-        List<SysEnterprise> enterprises = sysEnterpriseMapper.findByAreaAll(areaCode);
+        //风险等级
+        if(StringUtils.isNotBlank(inherentRiskStr)){
+            for (String str : inherentRiskStr.split(",")){
+                inherentRisks.add(TypeConversion.StringToInteger(str));
+            }
+        }
+
+
+        List<SysEnterprise> enterprises = sysEnterpriseMapper.selectPCList(orgCode,companyName,riskLevel,null,baseinclassid,inherentRisks);
         for (SysEnterprise enterprise : enterprises){
             if(StringUtils.isNotBlank(enterprise.getQrCode())){
                 System.out.println(enterprise.getQrCode());

inventory-gov/src/main/java/com/rzyc/controller/OtherController.java

@@ -516,7 +516,6 @@ public class OtherController extends BaseController{
         List<SysOrg> sysOrgs = sysOrgMapper.findUserArea(userArea);
 
         if(sysOrgs.size() > 0){
-
             //处理树形结构
             JSONArray jsonArray = handleAreaTree(sysOrgs);
             List<SysOrg> areas = JSONArray.parseArray(JSONArray.toJSONString(jsonArray),SysOrg.class);

inventory-gov/src/main/java/com/rzyc/controller/ent/PcCheckController.java

@@ -429,10 +429,14 @@ public class PcCheckController extends com.rzyc.controller.BaseController {
     public SingleResult<Page<BookEntHT>> dangerList(String title,String entName,String htLevel,String state,int page,int pageSize)throws Exception {
         SingleResult singleResult = new SingleResult();
         Pager<BookEntHT>bookEntHTPager = new Pager<>();
+
+        //默认搜索当前用户地区
+        String streetCode = getUserArea(getUserId());
+
         String userId = getUserId();
         String areaCode = getUserArea(userId);
         PageHelper.startPage(page,pageSize);
-        Page<BookEntHT>bookEntHTS = (Page<BookEntHT>) bookEntHTMapper.dangerListRecord(title,entName,htLevel,state,areaCode,page,pageSize);
+        Page<BookEntHT>bookEntHTS = (Page<BookEntHT>) bookEntHTMapper.dangerListRecord(title,entName,htLevel,state,areaCode,page,pageSize,streetCode);
         getDatePage(bookEntHTPager,bookEntHTS);
         singleResult.setCode(Code.SUCCESS.getCode());
         singleResult.setMessage(Message.SUCCESS);
@@ -465,7 +469,6 @@ public class PcCheckController extends com.rzyc.controller.BaseController {
         PageHelper.startPage(page,pageSize);
         Page<BookEntCheck> bookEntChecks = (Page<BookEntCheck>)bookEntCheckMapper.checkRecordList(entName,unitId,startTime,endTime,areaCode,page,pageSize);
         getDatePage(pager,bookEntChecks);
-
         if (bookEntChecks == null){
             singleResult.setMessage(Message.ERROR);
             singleResult.setCode(Code.ERROR.getCode());

inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java

@@ -19,6 +19,7 @@ import com.rzyc.model.*;
 import com.rzyc.model.check.*;
 import com.rzyc.model.ent.EntBillCon;
 import com.rzyc.model.ent.EntPromise;
+import com.rzyc.model.ent.EntUser;
 import com.rzyc.model.ent.SysEnterprise;
 import com.rzyc.model.user.SysUnit;
 import com.rzyc.model.user.SysUser;
@@ -662,6 +663,12 @@ public class PcCompanyController extends com.rzyc.controller.BaseController {
                 return singleResult;
             }
 
+            EntUser eu = entUserMapper.validAccount(sysEnterprise.getLrlinktel(),null);
+            if (null != eu){
+                singleResult.setMessage(Message.MOBILE_IS_CREATED);
+                singleResult.setCode(Code.ERROR.getCode());
+                return singleResult;
+            }
             getEntAreaCode(sysEnterpriseDo.getAreaCode(),sysEnterprise);
 
             sysEnterprise.setCreatedon(new Date());
@@ -702,6 +709,12 @@ public class PcCompanyController extends com.rzyc.controller.BaseController {
                 singleResult.setCode(Code.ERROR.getCode());
                 return singleResult;
             }
+            EntUser eu = entUserMapper.validAccountByEntId(sysEnterprise.getLrlinktel(),null,sysEnterpriseDo.getSysenterpriseid());
+            if (null != eu){
+                singleResult.setMessage(Message.MOBILE_IS_CREATED);
+                singleResult.setCode(Code.ERROR.getCode());
+                return singleResult;
+            }
 
             //如果二维码为空 则生成新的二维码
             SysEnterprise enterprise = sysEnterpriseMapper.selectByPrimaryKey(sysEnterprise.getSysenterpriseid());

inventory-gov/src/main/java/com/rzyc/controller/ent/WxProductionController.java

@@ -0,0 +1,115 @@
+package com.rzyc.controller.ent;
+
+import com.common.utils.model.Pager;
+import com.common.utils.model.SingleResult;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.rzyc.bean.ent.CertificatesPageDto;
+import com.rzyc.config.MethodAnnotation;
+import com.rzyc.controller.BaseController;
+import com.rzyc.model.EntCertificates;
+import com.rzyc.model.EntDevice;
+import com.rzyc.model.EntUserCredential;
+import com.rzyc.service.PcBusinessService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+
+
+/**
+ * @author Xuwanxin
+ * @date 2023/3/30
+ * */
+@Api(tags = "企业信息小程序")
+@CrossOrigin("*")
+@RequestMapping("entInfo")
+@RestController
+@Validated
+public class WxProductionController extends BaseController {
+
+
+    private PcBusinessService pcBusinessService;
+
+    @Autowired
+    public WxProductionController(PcBusinessService pcBusinessService) {
+        this.pcBusinessService = pcBusinessService;
+    }
+
+    /**
+     * 企业用户证照表
+     * @param entUserId 企业用户id
+     * @return 企业用户证照表
+     * @throws Exception
+     */
+    @ApiOperation(value = "企业用户证照表", notes = "企业用户证照表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "entUserId", value = "企业用户id",required = false, dataType = "string"),
+            @ApiImplicitParam(name = "page", value = "page",required = true, dataType = "int"),
+            @ApiImplicitParam(name = "pageSize", value = "pageSize",required = true, dataType = "int"),
+            @ApiImplicitParam(name = "credentialState", value = "证件过期 1.未过期 2.已超时",required = false, dataType = "int"),
+            @ApiImplicitParam(name = "enterpriseId", value = "企业id",required = false, dataType = "string"),
+    })
+    @GetMapping(value = "/entUserCredential")
+    @PreAuthorize("hasAnyAuthority('entUserCredential','entUserCredential:update')")
+    @MethodAnnotation(authorizations = {"entUserCredential","entUserCredential:update"},name = "企业用户证照表")
+    @ResponseBody
+    public SingleResult<List<EntUserCredential>> entUserCredential(String entUserId, @RequestParam(required = true) Integer page, @RequestParam(required = true)Integer pageSize, Integer credentialState, String enterpriseId)throws Exception{
+        return  pcBusinessService.entUserCredential(enterpriseId,entUserId,page,pageSize,credentialState);
+    }
+
+
+    /**
+     * 企业设备过期列表
+     * @return Data
+     * @throws Exception
+     */
+    @ApiOperation(value = "企业设备过期列表", notes = "企业设备过期列表")
+    @GetMapping(value = "/entDeviceOverdue")
+    @PreAuthorize("hasAnyAuthority('entDeviceOverdue')")
+    @MethodAnnotation(authorizations = {"entDeviceOverdue"},name = "应急资源删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "enterpriseId", value = "企业id",required = true, dataType = "string"),
+    })
+    @ResponseBody
+    public SingleResult<List<EntDevice>> selectEntEquipmentOverdue(@RequestParam("enterpriseId") String enterpriseId, Integer state , Integer deviceName)throws Exception{
+        return  pcBusinessService.selectEntEquipmentOverdue(enterpriseId,state,deviceName);
+    }
+
+
+    /**
+     * 证照分页
+     * @version v1.0
+     * @author dong
+     * @date 2022/9/27 14:45
+     */
+    @ApiOperation(value = "证照分页", notes = "证照分页")
+    @GetMapping("/certificatesPage")
+    @ResponseBody
+    public SingleResult<Pager<EntCertificates>> certificatesPage(@Valid CertificatesPageDto certificatesPageDto)throws Exception{
+        SingleResult<Pager<EntCertificates>> result = new SingleResult<>();
+        PageHelper.startPage(certificatesPageDto.getPage(), certificatesPageDto.getPageSize());
+        Page<EntCertificates> page ;
+        if (null != certificatesPageDto.getState()){
+            page = (Page<EntCertificates>)entCertificatesMapper.certificatesList(certificatesPageDto.getEnterpriseId(),certificatesPageDto.getState().split(","));
+        }else {
+            page = (Page<EntCertificates>)entCertificatesMapper.certificatesList(certificatesPageDto.getEnterpriseId(),null);
+
+        }
+        Pager<EntCertificates> pager = new Pager<>();
+        getDatePage(pager,page);
+        result.setData(pager);
+        return result;
+    }
+
+
+
+}

inventory-gov/src/main/java/com/rzyc/service/PcBusinessService.java

@@ -123,5 +123,20 @@ public class PcBusinessService extends BaseController {
         return result;
     }
 
+    public  SingleResult selectEntEquipmentOverdue(String enterpriseId,Integer state ,Integer deviceName){
+        SingleResult singleResult  = new SingleResult();
+        List<EntDevice>devices  =  entDeviceMapper.selectEntEquipmentOverdue(enterpriseId);
+        singleResult.setData(devices);
+        return singleResult;
+    }
+
+    @PageOperation
+    public SingleResult entUserCredential(String enterpriseId, String entUserId,Integer page,Integer pageSize,Integer credentialState){
+        SingleResult singleResult = new SingleResult();
+        Page<EntUserCredential>list = (Page<EntUserCredential>) entUserCredentialMapper.selectEntUserCredential(enterpriseId,entUserId,credentialState);
+        singleResult.setDataPager(list);
+        return singleResult;
+    }
+
 
 }

inventory-gov/src/main/resources/application-dev.yml

@@ -40,7 +40,7 @@ spring:
   #数据库
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://121.40.106.103:3306/inventory_db?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false
+    url: jdbc:mysql://121.40.106.103:3306/inventory_copy?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false
     username: rzyc
     password: ENC(FDlRK2MAcJBMF7UBHBJPLGzRkpWQ4T6dgYP2bDnTodQ=)
     tomcat:

inventory-gov/src/main/resources/application-prod.yml

@@ -28,7 +28,7 @@ spring:
   #数据库
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://121.40.106.103:3306/inventory_db?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false
+    url: jdbc:mysql://121.40.106.103:3306/inventory_copy?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false
     username: rzyc
     password: ENC(FDlRK2MAcJBMF7UBHBJPLGzRkpWQ4T6dgYP2bDnTodQ=)
     tomcat:
@@ -65,7 +65,7 @@ onstants:
   #上传文件基础路径
   service_file_header: http://42.193.40.239/
   #父级地区id
-  superior_org_code: 512000
+  superior_org_code: 513300
   #动态详情基础地址
   html_header: http://42.193.40.239:7010/
   #logourl

inventory-gov/src/main/resources/application-yun.yml

@@ -0,0 +1,97 @@
+server:
+  port: 8018
+
+spring:
+  servlet:
+    multipart:
+      enabled: true
+      max-file-size: 50MB
+      max-request-size: 100MB
+  mvc:
+    view:
+      prefix: classpath:/templates/
+      suffix: .html
+  devtools:
+    restart:
+      enabled: true
+  thymeleaf:
+    cache: false
+  resources:
+    cache:
+      period: 0
+  application:
+    name: log
+
+
+
+
+  #数据库
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://172.27.181.52:3306/inventory_db?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false
+    username: ENC(QE4vB4KHgFwuqi42wTs27w==)
+    password: ENC(9mRKdl9UCE8tkEsoO376nx5rCx58Htk1)
+    tomcat:
+      max-active: 10
+      min-idle: 10
+      initial-size: 2
+    hikari:
+      minimum-idle: 3
+      maximum-pool-size: 10
+      max-lifetime: 30000
+      connection-test-query: SELECT 1
+  jackson:
+    #设置json转时间时区为东八区
+    time-zone: GMT+8
+
+#mybatis 配置文件
+mybatis:
+  type-aliases-package: com.rzyc.model
+  mapper-locations: mapper/**/*.xml
+  config-location: classpath:mybatis-config.xml
+
+#打印sql
+logging:
+  level:
+    com.rzyc.mapper: debug
+
+
+#文件上传的配置
+onstants:
+  #上传文件存放地址
+  file_location: /static/rzyc/resource/inventory/uploadFile/
+  #上传文件公共地址
+  file_header: /static/resource/inventory/uploadFile/
+  #上传文件基础路径
+  service_file_header: http://172.27.181.247/
+  #父级地区id
+  superior_org_code: 513300
+  #动态详情基础地址
+  html_header: http://172.27.181.247:8018/
+  #logourl
+  logo_url: http://172.27.181.247/static/resource/inventory/citysafe_logo.png
+  #政府端帮助文档url
+  help_url: http://172.27.181.247:8018/appGovHelp
+  #企业端帮助文档url
+  ent_help_url: http://172.27.181.247:8018/appGovHelp
+  #行业部门id
+  unit_id: 5bd164aa-dd43-45e3-a5a2-649bb2fd9fb9
+  #镇街功能区
+  area_unit_id: 920184e5-0cd8-4ef5-bdc7-d992ac4f1c17
+  #验证码key
+  generate_code_key: GENERATE_CODE_KEY
+  #企业账号默认密码
+  default_passwd: csaq512000
+  #公示牌
+  gsp_path: /static/rzyc/resource/inventory/gsp.xlsx
+  #zip下载地址
+  zip_path: /static/rzyc/resource/inventory/zip
+  #导出word模板路径
+  word_tmp: /static/rzyc/resource/inventory/wordtmp
+
+
+
+#加密
+jasypt:
+  encryptor:
+    password: gzQdz

utils/src/main/java/com/common/utils/model/Message.java

@@ -174,4 +174,6 @@ public class Message {
 	public  static final String CANT_ADD_IN_COMPANY_LEVEL = "不允许在公司下直接编辑人员";
 
 	public  static final String NOT_ONLY_INSPECTION_CYCLE = "已经存在周期巡检,仅仅允许一个";
+
+	public static final String MOBILE_IS_CREATED="法人手机号已存在";
 }