禅道BUG修改

inventory-dao/src/main/java/com/rzyc/enums/UseState.java

@@ -0,0 +1,28 @@
+package com.rzyc.enums;
+
+/**
+ * 企业账号是否停用状态
+ * @author Xuwanxin
+ * @date 2023/2/28
+ *
+ * */
+public enum UseState {
+
+    USE(1),
+    STOP(2);
+
+
+    private Integer state;
+
+     UseState(Integer state) {
+        this.state = state;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+}

inventory-dao/src/main/java/com/rzyc/mapper/EntCertificatesMapper.java

@@ -23,4 +23,27 @@ public interface EntCertificatesMapper extends BaseMapper<EntCertificates> {
 
     List<EntCertificates> findAll();
 
+
+    /**
+     * 软删除证件状态
+     * @param state
+     * @param certificatesId
+     * @return integer
+     * */
+    Integer updateDelState(@Param("state") Integer state,@Param("certificatesId")String certificatesId);
+
+
+
+    /**
+     * 更新证照过期状态
+     * @return integer
+     * */
+    Integer scheduleUpdateState();
+
+    /**
+     * 更新证照即将过期状态
+     * @return integer
+     * */
+    Integer scheduleUpdateStateDueSoon();
+
 }

inventory-dao/src/main/java/com/rzyc/mapper/EntDeviceTypeMapper.java

@@ -40,4 +40,13 @@ public interface EntDeviceTypeMapper extends BaseMapper<EntDeviceType> {
      * */
     int addEntEquipment(@Param("entDeviceType") EntDeviceType entDeviceType);
 
+
+    /**
+     * 修改删除状态
+     * @param delState 删除状态
+     * @param deviceTypeId 设备类型id
+     * @return Integer
+     * */
+    Integer updateDelState(@Param("delState") Integer delState,@Param("deviceTypeId")String deviceTypeId);
+
 }

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

@@ -78,4 +78,15 @@ public interface EntPostMapper extends BaseMapper<EntPost> {
      * */
     int insertEntPostBatch(@Param("list") List<InPost> list,@Param("sysEnterpriseId") String sysEnterpriseId);
 
+
+
+
+    /**
+     * 软删除企业岗位
+     * @param postId 岗位主键
+     * @param delState 删除状态
+     * @return Integer
+     * */
+    Integer deleteEntPost(@Param("delState")Integer delState,@Param("postId")String postId);
+
 }

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

@@ -94,4 +94,13 @@ public interface EntUserMapper extends BaseMapper<EntUser> {
      * @return list
      * */
     List<EntUser>selectNoEntPostListUser();
+
+
+    /**
+     * 停用企业用户
+     * @param entUserId 企业用户id
+     * @param useState 企业停用状态
+     * @return Integer
+     * */
+    Integer stopUseEntUser(@Param("entUserId") String entUserId,@Param("useState")Integer useState);
 }

inventory-dao/src/main/java/com/rzyc/model/EntEmRehearsal.java

@@ -5,6 +5,8 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

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

@@ -20,11 +20,25 @@
     <sql id="Base_Column_List">
         certificates_id, enterprise_id, name, file_path, expire_time, state,create_by, create_time, modify_time, modify_by
     </sql>
+    <update id="updateDelState">
+        update ent_certificates set del_state  = #{state}  where certificates_id = #{certificatesId}
+    </update>
+    <update id="scheduleUpdateState">
+        update ent_certificates set state = 3 where certificates_id in (
+            select * from (select certificates_id from ent_certificates where now() > expire_time and del_state = 1 and state = 2  )b
+            )
+    </update>
+
+    <update id="scheduleUpdateStateDueSoon">
+        update ent_certificates set state = 3 where certificates_id in (
+            select * from (select certificates_id from ent_certificates where now() BETWEEN date_add(expire_time,interval-1 month) and expire_time  and del_state = 1   and state = 1)b
+        )
+    </update>
 
     <!--证件列表-->
     <select id="certificatesList" resultMap="BaseResultMap">
         SELECT * FROM ent_certificates ec
-        WHERE ec.`enterprise_id` = #{enterpriseId}
+        WHERE ec.`enterprise_id` = #{enterpriseId} and del_state = 1
         <if test="null != state and state.length >0">
             and  `state` in
             <foreach collection='state' open='(' item='id' separator=',' close=')'>
@@ -35,7 +49,7 @@
     </select>
 
     <select id="findAll" resultMap="BaseResultMap">
-        select * from ent_certificates ec
+        select * from ent_certificates ec and del_state = 1
     </select>
 
 </mapper>

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

@@ -37,6 +37,10 @@
         where type_id = #{entDeviceType.typeId}
     </update>
 
+    <update id="updateDelState">
+        update ent_device_type set del_state = #{delState} where type_id = #{deviceTypeId}
+    </update>
+
     <insert id="addEntEquipment">
         insert into ent_device_type (type_id,enterprise_id,name,logo,parent_id,parent_path,parent_name,sort_id)
         values (#{entDeviceType.typeId},#{entDeviceType.enterpriseId},#{entDeviceType.name},#{entDeviceType.logo},#{entDeviceType.parentId},#{entDeviceType.parentPath},#{entDeviceType.parentName}

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

@@ -27,7 +27,7 @@
         </if>
     </select>
 
-    <update id="UpdateEntEmRehearsal">
+    <update id="updateEntEmRehearsal">
         update ent_em_rehearsal set ent_em_rehearsal_start_time = #{entEmRehearsalStartTime},ent_em_rehearsal_end_time = #{entEmRehearsalEndTime},ent_em_rehearsal_project = #{entEmRehearsalProject},
                                  ent_em_rehearsal_remark = #{entEmRehearsalRemark},modify_by = #{modifyBy},modify_time = #{modifyTime},enterprise_id = #{enterpriseId}
         where ent_em_rehearsal_id = #{entEmRehearsalId}

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

@@ -27,7 +27,7 @@
 
     <select id="selectEntUserTree" resultMap="BaseResultMap">
         select * from ent_post
-        where enterprise_id = #{enterpriseId}
+        where enterprise_id = #{enterpriseId} and del_state = 1
         <if test="null != postId and '' != postId">
             and post_path like concat('%',#{postId},'%')
         </if>
@@ -48,7 +48,7 @@
 
 
     <select id="getParentPost" resultMap="BaseResultMap">
-        select ep2.* from ent_post ep inner join ent_post ep2 on ep2.post_id  = ep.parent_id where ep.post_id = #{postId}
+        select ep2.* from ent_post ep inner join ent_post ep2 on ep2.post_id  = ep.parent_id where ep.post_id = #{postId} and ep.del_state = 1
     </select>
 
 
@@ -56,6 +56,10 @@
         delete from ent_post where `name` = #{legalPerson} and enterprise_id = #{enterpriseId}
     </delete>
 
+    <update id="deleteEntPost">
+        update ent_post set del_state = #{delState} where   post_id = #{postId}
+    </update>
+
     <select id="selectNoDutyPost" resultType="com.rzyc.model.ent.EntPost">
         select ep.* from ent_post  ep left join ent_post_duty  epd on epd.post_id = ep.post_id where epd.duty_id is null
     </select>

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

@@ -28,7 +28,7 @@
 
 
     <select id="selectByName" resultMap="BaseResultMap">
-        select * from ent_user where name = #{name}
+        select * from ent_user where name = #{name} and use_state = 1
     </select>
 
     <resultMap id="entUserListStatistic" type="com.rzyc.model.ent.EntUser">
@@ -67,7 +67,7 @@
             left join   ent_post ep on eu.post_id = ep.post_id
             left join   ent_user_credential euc on eu.ent_user_id = euc.ent_user_id
             left join   ent_user_type eut on eut.id = eu.user_type
-            where 1=1
+            where eu.use_state = 1
             <if test="null != keyContent and '' != keyContent">
                 and ( eu.name like concat('%',#{keyContent},'%')
                 or eu.job_number like concat('%',#{keyContent},'%')
@@ -88,7 +88,7 @@
     </select>
 
     <select id="selectEntUserListNoPage" resultMap="BaseResultMap">
-        select * from  ent_user eu where  eu.user_type  = 2
+        select * from  ent_user eu where  eu.user_type  = 2 and use_state = 1
         <if test="null != name and '' != name">
             and eu.name like concat('%',#{name},'%')
         </if>
@@ -113,6 +113,9 @@
             modify_by = #{entUser.modifyBy}
             where ent_user_id  = #{entUser.entUserId}
     </update>
+    <update id="stopUseEntUser">
+        update ent_user set  use_state =  #{useState} where ent_user_id  = #{entUserId}
+    </update>
 
     <select id="validMobile" resultMap="BaseResultMap">
         select ent_user_id,name,mobile,password,post_id from ent_user where mobile = #{mobile}

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

@@ -27,6 +27,11 @@ public class SaticScheduleTask {
     }
 
 
+    @Scheduled(cron = "0 1 */1 * * ?")
+    private void certificationState() {
+        taskService.scheduleUpdateState();
+    }
+
 
 
 }

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

@@ -137,6 +137,23 @@ public class EnterpriseEquipmentController extends BaseController {
         return  pcBusinessService.addOrUpdateEntEquipmentType(addOrUpdateEntEquipmentTypeDto);
     }
 
+    /**
+     * 删除设备类型
+     * @return 删除设备类型
+     * @throws Exception
+     */
+    @ApiOperation(value = "删除设备类型", notes = "删除设备类型")
+    @PostMapping(value = "/delDeviceType")
+    @PreAuthorize("hasAnyAuthority('entEquipmentType:delete')")
+    @MethodAnnotation(authorizations = {"entEquipmentType:delete"},name = "删除设备类型")
+    @ResponseBody
+    public SingleResult delDeviceType(String typeId)throws Exception{
+        return  pcBusinessService.delDeviceType(typeId);
+    }
+
+
+
+
     /**
      * 新增设备,修改设备
      * @return 新增设备,修改设备

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

@@ -808,6 +808,22 @@ public class PcCompanyController extends BaseController{
         return result;
     }
 
+
+    /**
+     * 证照软删除
+     * @author Xuwanxin
+     * @date 2023/3/1
+     */
+    @ApiOperation(value = "证照软删除", notes = "证照软删除")
+    @PostMapping("/deleteCertificates")
+    @ResponseBody
+    public SingleResult<String> deleteCertificates(String certificatesId)throws Exception{
+        return pcBusinessService.deleteCertificates(certificatesId);
+    }
+
+
+
+
     /**
      * 检查记录详细
      * @version v1.0

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

@@ -331,6 +331,7 @@ public class PersonalController extends BaseController{
             @ApiImplicitParam(name = "pageSize", value = "pageSize",required = true, dataType = "int"),
             @ApiImplicitParam(name = "postId", value = "岗位id",required = false, dataType = "string"),
             @ApiImplicitParam(name = "enterpriseId", value = "企业id",required = false, dataType = "string"),
+            @ApiImplicitParam(name = "userType", value = "人员类型",required = false, dataType = "string"),
     })
     @GetMapping(value = "/entUserList")
     @PreAuthorize("hasAnyAuthority('entUserList','entUserList:update')")
@@ -387,6 +388,23 @@ public class PersonalController extends BaseController{
 
 
 
+    /**
+     * 停用岗位人员
+     * @param entUserId
+     * @return int
+     * @throws Exception
+     */
+    @ApiOperation(value = "停用岗位人员", notes = "停用岗位人员")
+    @PostMapping(value = "/stopUseEntUser")
+    @PreAuthorize("hasAnyAuthority('addOrUpdateEntUser:delete')")
+    @MethodAnnotation(authorizations = {"addOrUpdateEntUser:delete"},name = "停用岗位人员")
+    @ResponseBody
+    public SingleResult stopUseEntUser(String entUserId)throws Exception{
+        return  pcBusinessService.stopUseEntUser(entUserId);
+    }
+
+
+
     /**
      * 手动企业分配任务
      * @param listDto
@@ -447,6 +465,21 @@ public class PersonalController extends BaseController{
         return  pcBusinessService.addOrUpdateEntPost(addOrUpdateEntPostDto);
     }
 
+    /**
+     * 软删除公司岗位
+     * @param postId
+     * @return SingleResult
+     * @throws Exception
+     */
+    @ApiOperation(value = "软删除公司岗位", notes = "软删除公司岗位")
+    @PostMapping(value = "/deletePost")
+    @PreAuthorize("hasAnyAuthority('addOrUpdateEntPost:delete')")
+    @MethodAnnotation(authorizations = {"addOrUpdateEntPost:delete"},name = "软删除公司岗位")
+    @ResponseBody
+    public SingleResult deleteEntPost(String postId)throws Exception{
+        return  pcBusinessService.deleteEntPost(postId);
+    }
+
 
 
     /**

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

@@ -13,10 +13,7 @@ import com.github.pagehelper.Page;
 import com.rzyc.advice.CustomException;
 import com.rzyc.config.RedisUtil;
 import com.rzyc.controller.BaseController;
-import com.rzyc.enums.DelState;
+import com.rzyc.enums.*;
-import com.rzyc.enums.PostPathConcat;
-import com.rzyc.enums.RedisKeys;
-import com.rzyc.enums.Split;
 import com.rzyc.model.*;
 import com.rzyc.model.EasyExcel.EasyExcelEnterprise;
 import com.rzyc.model.EasyExcel.EasyExcelInList;
@@ -484,7 +481,7 @@ public class PcBusinessService extends BaseController {
         }else {
             entDevice.setCreateBy(getUserId());
             entDevice.setCreateTime(new Date());
-            entDevice.setDeviceId(RandomNumber.getUUid());
+    /*        entDevice.setDeviceId(RandomNumber.getUUid());*/
             result = entDeviceMapper.insert(entDevice);
         }
         if (result != 1 ){
@@ -1302,4 +1299,44 @@ public class PcBusinessService extends BaseController {
         return singleResult;
     }
 
+    public SingleResult stopUseEntUser(String entUserId){
+        SingleResult singleResult = new SingleResult();
+        Integer result = entUserMapper.stopUseEntUser(entUserId,UseState.STOP.getState());
+        if (result != 1){
+            singleResult.setCode(Code.ERROR.getCode());
+            singleResult.setMessage(Message.ERROR);
+        }
+        return singleResult;
+    }
+
+    public SingleResult deleteEntPost(String postId){
+        SingleResult singleResult = new SingleResult();
+        Integer result = entPostMapper.deleteEntPost(DelState.DELETE.getState(),postId);
+        if (result <= 1){
+            singleResult.setCode(Code.ERROR.getCode());
+            singleResult.setMessage(Message.ERROR);
+        }
+        return singleResult;
+    }
+
+    public SingleResult deleteCertificates(String certificatesId){
+        SingleResult singleResult = new SingleResult();
+        Integer result = entCertificatesMapper.updateDelState(DelState.DELETE.getState(),certificatesId);
+        if (result  != 1){
+            singleResult.setCode(Code.ERROR.getCode());
+            singleResult.setMessage(Message.ERROR);
+        }
+        return singleResult;
+    }
+
+    public SingleResult delDeviceType(String deviceTypeId){
+        SingleResult singleResult  = new SingleResult();
+        Integer result = entDeviceTypeMapper.updateDelState(DelState.DELETE.getState(),deviceTypeId);
+        if (result != 1){
+            singleResult.setCode(Code.ERROR.getCode());
+            singleResult.setMessage(Message.ERROR);
+        }
+        return  singleResult;
+    }
+
 }

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

@@ -192,6 +192,13 @@ public class TaskService extends BaseController {
     }
 
 
+    public void  scheduleUpdateState(){
+        System.out.println("证件过期定时任务开始");
+        entCertificatesMapper.scheduleUpdateStateDueSoon();
+        entCertificatesMapper.scheduleUpdateState();
+        System.out.println("证件过期定时任务结束");
+    }
+
 
 
 

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

@@ -31,6 +31,7 @@ public class PcBusinessService extends BaseController {
     @PageOperation
     public SingleResult entEmEquipmentList(String enterpriseId,Integer page,Integer pageSize,String resourceType){
         SingleResult singleResult = new SingleResult();
+        System.out.println("我的真实ip地址呢" + request.getRemoteAddr());
         Page<EntEmEquipment> entEmEquipments = (Page<EntEmEquipment>) entEmEquipmentMapper.selectEntEmEquipmentList(enterpriseId,resourceType);
         singleResult.setDataPager(entEmEquipments);
         return singleResult;