企业端设备模块->企业端PC,小程序接口调试

inventory-dao/src/main/java/com/rzyc/bean/user/dto/AppLoginDto.java

@@ -0,0 +1,46 @@
+package com.rzyc.bean.user.dto;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 小程序登陆Dto
+ * @author Xuwanxin
+ * @date 2022/11/14
+ *
+ * */
+@ApiModel
+public class AppLoginDto {
+
+    @NotNull(message = "用户名不能为空")
+    @ApiModelProperty(value = "用户名",required = true)
+    public String sysusername;
+
+    @NotNull(message = "密码不能为空")
+    @ApiModelProperty(value = "密码",required = true)
+    public String syspassword;
+
+
+    public String getSysusername() {
+        return sysusername;
+    }
+
+    public void setSysusername(String sysusername) {
+        this.sysusername = sysusername;
+    }
+
+    public String getSyspassword() {
+        return syspassword;
+    }
+
+    public void setSyspassword(String syspassword) {
+        this.syspassword = syspassword;
+    }
+
+
+
+}

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

@@ -22,9 +22,10 @@ public interface EntEmEquipmentMapper extends BaseMapper<EntEmEquipment> {
     /**
      * 企业应急资源
      * @param enterpriseId 企业id
+     * @param resourceType 物质类型
      * @return list
      * */
-    List<EntEmEquipment> selectEntEmEquipmentList(@Param("enterpriseId") String enterpriseId);
+    List<EntEmEquipment> selectEntEmEquipmentList(@Param("enterpriseId") String enterpriseId,@Param("resourceType") String resourceType);
 
 
     /**
@@ -34,4 +35,13 @@ public interface EntEmEquipmentMapper extends BaseMapper<EntEmEquipment> {
      * */
     int updateEntEmEquipment(EntEmEquipment entEmEquipment);
 
+
+
+    /**
+     * 删除企业应急资源
+     * @param id 主键
+     * @return int
+     * */
+    int updateDelState(String id);
+
 }

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

@@ -36,4 +36,13 @@ public interface EntEmExpertMapper extends BaseMapper<EntEmExpert> {
      * */
     int updateEntEmExpertUpdate(EntEmExpert entEmExpert);
 
+
+
+    /**
+     * 企业应急专家删除
+     * @param id 主键
+     * @return int
+     * */
+    int updateDelState(String id);
+
 }

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

@@ -2,6 +2,7 @@ package com.rzyc.mapper;
 
 import com.rzyc.model.EntEmRehearsal;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -21,9 +22,10 @@ public interface EntEmRehearsalMapper extends BaseMapper<EntEmRehearsal> {
     /**
      * 查询应急演练
      * @param enterpriseId 企业id
+     * @param entEmRehearsalProject 项目
      * @return list
      * */
-    List<EntEmRehearsal>selectEntEmRehearsalList(String enterpriseId);
+    List<EntEmRehearsal>selectEntEmRehearsalList(@Param("enterpriseId") String enterpriseId,@Param("entEmRehearsalProject") String entEmRehearsalProject);
 
 
     /**
@@ -33,4 +35,11 @@ public interface EntEmRehearsalMapper extends BaseMapper<EntEmRehearsal> {
      * */
     int updateEntEmRehearsal(EntEmRehearsal entEmRehearsal);
 
+    /**
+     * 删除应急演练
+     * @param id
+     * @return int
+     * */
+    int updateDelState(String id);
+
 }

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

@@ -21,10 +21,11 @@ public interface EntEmReservePlanMapper extends BaseMapper<EntEmReservePlan> {
 
     /**
      * 企业应急预案
-     * @param enterpriseId
+     * @param enterpriseId 公司id
+     * @param entEmReservePlanName 预案名
      * @return list
      * */
-    List<EntEmReservePlan>selectEntEmReservePlanList(@Param("enterpriseId") String enterpriseId);
+    List<EntEmReservePlan>selectEntEmReservePlanList(@Param("enterpriseId") String enterpriseId,@Param("entEmReservePlanName") String entEmReservePlanName);
 
 
     /**
@@ -34,4 +35,12 @@ public interface EntEmReservePlanMapper extends BaseMapper<EntEmReservePlan> {
      * */
     int updateEntEmReservePlan(EntEmReservePlan entEmReservePlan);
 
+
+    /**
+     * 企业应急预案删除
+     * @param id  主键
+     * @return int
+     * */
+    int updateDelState(String id);
+
 }

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

@@ -30,9 +30,10 @@ public interface EntUserMapper extends BaseMapper<EntUser> {
      * 查询企业用户表
      * @param keyContent 关键字
      * @param postId 岗位id
+     * @param enterpriseId 企业id
      * @return EntUser 企业用户实体
      * */
-    List<EntUser>selectEntUserList(@Param("keyContent") String keyContent,@Param("postId")String postId);
+    List<EntUser>selectEntUserList(@Param("keyContent") String keyContent,@Param("postId")String postId,@Param("enterpriseId") String enterpriseId);
 
 
     /**

inventory-dao/src/main/java/com/rzyc/model/EntCertificates.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;
 
@@ -38,6 +40,7 @@ public class EntCertificates implements Serializable {
     @TableField("file_path")
     private String filePath;
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "证照到期时间")
     @TableField("expire_time")
     private Date expireTime;

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

@@ -86,6 +86,17 @@ public class EntDeviceInsCycle implements Serializable {
     @TableField("modify_time")
     private Date modifyTime;
 
+    @TableField("next_time_inspection")
+    private Date nextTimeInspection;
+
+    public Date getNextTimeInspection() {
+        return nextTimeInspection;
+    }
+
+    public void setNextTimeInspection(Date nextTimeInspection) {
+        this.nextTimeInspection = nextTimeInspection;
+    }
+
     public String getInspectionId() {
         return inspectionId;
     }

inventory-dao/src/main/java/com/rzyc/model/dto/AddOrUpdateDeviceInspectionCycleDto.java

@@ -1,5 +1,6 @@
 package com.rzyc.model.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
@@ -47,6 +48,17 @@ public class AddOrUpdateDeviceInspectionCycleDto {
     @ApiModelProperty("技术措施")
     private String technicalMeasures;
 
+    @TableField("next_time_inspection")
+    private Date nextTimeInspection;
+
+    public Date getNextTimeInspection() {
+        return nextTimeInspection;
+    }
+
+    public void setNextTimeInspection(Date nextTimeInspection) {
+        this.nextTimeInspection = nextTimeInspection;
+    }
+
     public String getInspectionId() {
         return inspectionId;
     }

inventory-dao/src/main/java/com/rzyc/model/ent/EntUser.java

@@ -129,6 +129,18 @@ public class EntUser implements Serializable {
     @TableField(exist = false)
     private String postName;
 
+    @ApiModelProperty(value = "企业名")
+    @TableField(exist = false)
+    private String enterpriseName;
+
+    public String getEnterpriseName() {
+        return enterpriseName;
+    }
+
+    public void setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
+    }
+
     public String getPostName() {
         return postName;
     }

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

@@ -23,6 +23,9 @@
 
     <select id="selectEntEmEquipmentList" resultMap="BaseResultMap">
         select  * from ent_em_equipment where  enterprise_id = #{enterpriseId}  and del_state = 1
+        <if test="null != resourceType and '' != resourceType">
+            and ent_em_equipment_type like concat('%',#{resourceType},'%')
+        </if>
     </select>
 
     <update id="updateEntEmEquipment">
@@ -30,4 +33,8 @@
                                     ent_em_equipment_name = #{entEmEquipmentName},enterprise_id = #{enterpriseId},modify_time = #{modifyTime},modify_by = #{modifyBy} where  ent_em_equipment_id = #{entEmEquipmentId}
     </update>
 
+    <update id="updateDelState">
+        update ent_em_equipment set del_state = 2 where ent_em_equipment_id = #{id}
+    </update>
+
 </mapper>

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

@@ -41,4 +41,8 @@
                                  ent_em_expert_address = #{entEmExpertAddress},age  = #{age},modify_by = #{modifyBy},modify_time = #{modifyTime}
         where ent_em_expert_id = #{entEmExpertId}
     </update>
+
+    <update id="updateDelState">
+        update ent_em_expert set del_state = 2 where ent_em_expert_id = #{id}
+    </update>
 </mapper>

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

@@ -22,12 +22,19 @@
 
     <select id="selectEntEmRehearsalList" resultMap="BaseResultMap">
         select * from ent_em_rehearsal where enterprise_id = #{enterpriseId} and del_state = 1
+        <if test="null != entEmRehearsalProject and '' !=  entEmRehearsalProject">
+            and ent_em_rehearsal_project like concat('%',#{entEmRehearsalProject},'%')
+        </if>
     </select>
 
     <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},
-                                set ent_em_rehearsal_remark = #{entEmRehearsalRemark},modify_by = #{modifyBy},modify_time = #{modifyTime},enterprise_id = #{enterpriseId}
+                                 ent_em_rehearsal_remark = #{entEmRehearsalRemark},modify_by = #{modifyBy},modify_time = #{modifyTime},enterprise_id = #{enterpriseId}
         where ent_em_rehearsal_id = #{entEmRehearsalId}
     </update>
 
+    <update id="updateDelState">
+        update ent_em_rehearsal set del_state = 2 where ent_em_rehearsal_id = #{id}
+    </update>
+
 </mapper>

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

@@ -21,6 +21,9 @@
 
     <select id="selectEntEmReservePlanList" resultMap="BaseResultMap">
         select * from  ent_em_reserve_plan where enterprise_id = #{enterpriseId} and del_state = 1
+        <if test="null != entEmReservePlanName and '' != entEmReservePlanName">
+            and ent_em_reserve_plan_name like concat ('%',#{entEmReservePlanName},'%')
+        </if>
     </select>
 
     <update id="updateEntEmReservePlan">
@@ -29,4 +32,8 @@
         where  ent_em_reserve_plan_id = #{entEmReservePlanId}
     </update>
 
+    <update id="updateDelState">
+        update ent_em_reserve_plan set  del_state = 2 where  ent_em_reserve_plan_id = #{id}
+    </update>
+
 </mapper>

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

@@ -75,6 +75,9 @@
             <if test="null != postId and '' != postId">
                 and eu.post_path  like concat('%',#{postId},'%')
             </if>
+            <if test="null != enterpriseId and '' != enterpriseId">
+                and eu.enterprise_id  = #{enterpriseId}
+            </if>
             group by eu.ent_user_id)as t1
             left join ent_post_task ept on t1.ent_user_id = ept.ent_user_id
             group by t1.ent_user_id

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

@@ -2560,7 +2560,7 @@
   </select>
 
   <select id="findEnterpriseByPhoneNumber" resultMap="BaseResultMap">
-    select sysent.EntName,sysent.state,sysent.SysEnterpriseId from ent_user eu left join sysenterprise sysent on eu.enterprise_id = sysent.SysEnterpriseId where eu.mobile = #{entUserPhone}
+    select sysent.EntName,sysent.state,sysent.SysEnterpriseId,sysent.EntName from ent_user eu left join sysenterprise sysent on eu.enterprise_id = sysent.SysEnterpriseId where eu.mobile = #{entUserPhone}
   </select>
 
 

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

@@ -6,6 +6,7 @@ import com.rzyc.config.MethodAnnotation;
 import com.rzyc.config.RedisUtil;
 import com.rzyc.model.EntEmEquipment;
 import com.rzyc.model.EntEmExpert;
+import com.rzyc.model.EntEmRehearsal;
 import com.rzyc.model.EntEmReservePlan;
 import com.rzyc.model.dto.EntEmEquipmentDto;
 import com.rzyc.model.dto.EntEmExpertDto;
@@ -16,6 +17,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.annotation.Validated;
@@ -56,13 +58,15 @@ public class EmergencyEquipmentController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "enterpriseId", value = "企业id",required = true, dataType = "string"),
             @ApiImplicitParam(name = "page", value = "page",required = true, dataType = "string"),
-            @ApiImplicitParam(name = "pageSize", value = "page",required = true, dataType = "string"),
+            @ApiImplicitParam(name = "pageSize", value = "pageSize",required = true, dataType = "string"),
+            @ApiImplicitParam(name = "resourceType", value = "物质类型",required = false, dataType = "string"),
     })
     @ResponseBody
     public SingleResult<List<EntEmEquipment>> entEmEquipmentList(@RequestParam(required = true) String enterpriseId,
                                                                  @RequestParam(required = true)Integer page,
-                                                                 @RequestParam(required = true)Integer pageSize)throws Exception{
+                                                                 @RequestParam(required = true)Integer pageSize,
-        return  pcBusinessService.entEmEquipmentList(enterpriseId,page,pageSize);
+                                                                 String resourceType)throws Exception{
+        return  pcBusinessService.entEmEquipmentList(enterpriseId,page,pageSize,resourceType);
     }
 
     /**
@@ -132,13 +136,15 @@ public class EmergencyEquipmentController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "enterpriseId", value = "企业id",required = true, dataType = "string"),
             @ApiImplicitParam(name = "page", value = "page",required = true, dataType = "string"),
-            @ApiImplicitParam(name = "pageSize", value = "page",required = true, dataType = "string"),
+            @ApiImplicitParam(name = "pageSize", value = "pageSize",required = true, dataType = "string"),
+            @ApiImplicitParam(name = "entEmReservePlanName", value = "预案名",required = false, dataType = "string")
     })
     @ResponseBody
     public SingleResult<List<EntEmReservePlan>> entEmReservePlanList(@RequestParam(required = true)String enterpriseId,
                                                                 @RequestParam(required = true)Integer page,
-                                                                @RequestParam(required = true)Integer pageSize)throws Exception{
+                                                                @RequestParam(required = true)Integer pageSize,
-        return  pcBusinessService.entEmReservePlanList(enterpriseId,page,pageSize);
+                                                                     String entEmReservePlanName)throws Exception{
+        return  pcBusinessService.entEmReservePlanList(enterpriseId,page,pageSize,entEmReservePlanName);
     }
 
     /**
@@ -168,13 +174,15 @@ public class EmergencyEquipmentController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "enterpriseId", value = "企业id",required = true, dataType = "string"),
             @ApiImplicitParam(name = "page", value = "page",required = true, dataType = "string"),
-            @ApiImplicitParam(name = "pageSize", value = "page",required = true, dataType = "string"),
+            @ApiImplicitParam(name = "pageSize", value = "pageSize",required = true, dataType = "string"),
+            @ApiImplicitParam(name = "entEmRehearsalProject", value = "项目",required = false, dataType = "string")
     })
     @ResponseBody
-    public SingleResult<List<EntEmReservePlan>> entEmRehearsalList(@RequestParam(required = true)String enterpriseId,
+    public SingleResult<List<EntEmRehearsal>> entEmRehearsalList(@RequestParam(required = true)String enterpriseId,
                                                                  @RequestParam(required = true)Integer page,
-                                                                     @RequestParam(required = true)Integer pageSize)throws Exception{
+                                                                 @RequestParam(required = true)Integer pageSize,
-        return  pcBusinessService.entEmRehearsalList(enterpriseId,page,pageSize);
+                                                                 String entEmRehearsalProject)throws Exception{
+        return  pcBusinessService.entEmRehearsalList(enterpriseId,page,pageSize,entEmRehearsalProject);
     }
 
 
@@ -196,8 +204,75 @@ public class EmergencyEquipmentController {
 
 
 
+    /**
+     * 应急演练删除
+     * @return Data
+     * @throws Exception
+     */
+    @ApiOperation(value = "应急演练删除", notes = "应急演练删除")
+    @GetMapping(value = "/entEmRehearsalDelete")
+    @PreAuthorize("hasAnyAuthority('entEmRehearsalList:delete')")
+    @MethodAnnotation(authorizations = {"entEmRehearsalList:delete"},name = "应急演练删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "主键", value = "id",required = true, dataType = "string"),
+    })
+    @ResponseBody
+    public SingleResult entEmRehearsalDelete(@RequestParam("id") String id)throws Exception{
+        return  pcBusinessService.entEmRehearsalDelete(id);
+    }
 
 
+    /**
+     * 应急预案删除
+     * @return Data
+     * @throws Exception
+     */
+    @ApiOperation(value = "应急预案删除", notes = "应急预案删除")
+    @GetMapping(value = "/entEmReservePlanDelete")
+    @PreAuthorize("hasAnyAuthority('entEmReservePlanList:delete')")
+    @MethodAnnotation(authorizations = {"entEmReservePlanList:delete"},name = "应急预案删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "主键", value = "id",required = true, dataType = "string"),
+    })
+    @ResponseBody
+    public SingleResult entEmReservePlanDelete(@RequestParam("id") String id)throws Exception{
+        return  pcBusinessService.entEmReservePlanDelete(id);
+    }
+
+    /**
+     * 应急专家删除
+     * @return Data
+     * @throws Exception
+     */
+    @ApiOperation(value = "应急专家删除", notes = "应急专家删除")
+    @GetMapping(value = "/entEmExpertDelete")
+    @PreAuthorize("hasAnyAuthority('entEmExpertList:delete')")
+    @MethodAnnotation(authorizations = {"entEmExpertList:delete"},name = "应急专家删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "主键", value = "id",required = true, dataType = "string"),
+    })
+    @ResponseBody
+    public SingleResult entEmExpertDelete(@RequestParam("id") String id)throws Exception{
+        return  pcBusinessService.entEmExpertDelete(id);
+    }
+
+
+    /**
+     * 应急资源删除
+     * @return Data
+     * @throws Exception
+     */
+    @ApiOperation(value = "应急资源删除", notes = "应急资源删除")
+    @GetMapping(value = "/entEmEquipmentDelete")
+    @PreAuthorize("hasAnyAuthority('entEmEquipmentList:delete')")
+    @MethodAnnotation(authorizations = {"entEmEquipmentList:delete"},name = "应急资源删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "主键", value = "id",required = true, dataType = "string"),
+    })
+    @ResponseBody
+    public SingleResult entEmEquipmentDelete(@RequestParam("id") String id)throws Exception{
+        return  pcBusinessService.entEmEquipmentDelete(id);
+    }
 
 
 

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

@@ -7,6 +7,7 @@ import com.common.utils.StringUtils;
 import com.common.utils.encryption.PasswdFactory;
 import com.common.utils.jwt.JwtUtil;
 import com.common.utils.model.SingleResult;
+import com.rzyc.bean.user.dto.AppLoginDto;
 import com.rzyc.bean.user.dto.LoginDto;
 import com.rzyc.config.MethodAnnotation;
 import com.rzyc.config.RedisUtil;
@@ -56,8 +57,6 @@ public class PersonalController extends BaseController{
 
     RedisUtil redisUtil;
 
-
-
     @Autowired
     public PersonalController(UserLoginService userLoginService, PcBusinessService pcBusinessService, RedisUtil redisUtil) {
         this.userLoginService = userLoginService;
@@ -94,6 +93,30 @@ public class PersonalController extends BaseController{
         return result;
     }
 
+    /**
+     * 小程序用户登录
+     * @version v1.0
+     */
+    @ApiOperation(value = "小程序用户登录", notes = "小程序用户登录")
+    @PostMapping(value = "/appLogin")
+    public SingleResult<EntUser> appLogin(@Valid AppLoginDto appLoginDto)throws Exception{
+        SingleResult<EntUser> result = new SingleResult<>();
+        if(null != appLoginDto.sysusername && null !=  appLoginDto.getSyspassword()) {
+            EntUser loginResult = userLoginService.login(appLoginDto.sysusername, appLoginDto.getSyspassword());
+            if (Objects.isNull(loginResult)) {
+                result.setCode(Code.PASSWORD_OR_ACCOUNT_ERROR.getCode());
+                result.setMessage(Message.PASSWORD_OR_ACCOUNT_ERROR);
+            } else {
+                System.out.println("登陆成功");
+                result.setData(loginResult);
+            }
+        }else {
+            result.setCode(Code.CODE_ERROT.getCode());
+            result.setMessage(Message.CODE_ERROT);
+        }
+        return result;
+    }
+
 
 
 
@@ -301,20 +324,22 @@ public class PersonalController extends BaseController{
      */
     @ApiOperation(value = "企业岗位人员总体信息列表", notes = "企业岗位人员总体信息列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "keyContent", value = "搜索关键字",required = true, dataType = "string"),
+            @ApiImplicitParam(name = "keyContent", value = "搜索关键字",required = false, dataType = "string"),
             @ApiImplicitParam(name = "page", value = "page",required = true, dataType = "int"),
             @ApiImplicitParam(name = "pageSize", value = "pageSize",required = true, dataType = "int"),
-            @ApiImplicitParam(name = "postId", value = "postId",required = false, dataType = "string"),
+            @ApiImplicitParam(name = "postId", value = "岗位id",required = false, dataType = "string"),
+            @ApiImplicitParam(name = "enterpriseId", value = "企业id",required = false, dataType = "string"),
     })
     @GetMapping(value = "/entUserList")
     @PreAuthorize("hasAnyAuthority('entUserList','entUserList:update')")
     @MethodAnnotation(authorizations = {"entUserList","entUserList:update"},name = "企业岗位人员总体信息列表")
     @ResponseBody
-    public SingleResult<List<EntUser>> entUserList(@RequestParam(required = true) String keyContent,
+    public SingleResult<List<EntUser>> entUserList(@RequestParam(required = false) String keyContent,
                                                    @RequestParam(required = false) String postId,
                                     @RequestParam(required = true) Integer page,
-                                    @RequestParam(required = true) Integer pageSize)throws Exception{
+                                    @RequestParam(required = true) Integer pageSize,
-        return  pcBusinessService.entUserList(keyContent,page,pageSize,postId);
+                                                   @RequestParam(required = false) String enterpriseId)throws Exception{
+        return  pcBusinessService.entUserList(keyContent,page,pageSize,postId,enterpriseId);
     }
 
 

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

@@ -22,10 +22,13 @@ import com.rzyc.model.dto.SparePartDto;
 import com.rzyc.model.ent.InEntList;
 import com.rzyc.model.ent.SysEnterprise;
 
+import org.junit.Test;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -192,9 +195,9 @@ public class PcBusinessService extends BaseController {
     }
 
     @PageOperation
-    public SingleResult entUserList(String keyContent,Integer page,Integer pageSize,String postId){
+    public SingleResult entUserList(String keyContent,Integer page,Integer pageSize,String postId,String enterpriseId){
         SingleResult singleResult = new SingleResult();
-        Page<EntUser>users = (Page<EntUser>) entUserMapper.selectEntUserList(keyContent,postId);
+        Page<EntUser>users = (Page<EntUser>) entUserMapper.selectEntUserList(keyContent,postId,enterpriseId);
         //计算履职百分比,后期这里使用redis来读取履职进度
         for (EntUser e:users.getResult()) {
             Integer total  = e.getFinishTask() + e.getOngoingTask() + e.getOverTimeTask();
@@ -432,11 +435,13 @@ public class PcBusinessService extends BaseController {
         return singleResult;
     }
 
-    public SingleResult addOrUpdateDeviceInspectionCycle(AddOrUpdateDeviceInspectionCycleDto addOrUpdateDeviceInspectionCycleDto){
+    public SingleResult addOrUpdateDeviceInspectionCycle(AddOrUpdateDeviceInspectionCycleDto addOrUpdateDeviceInspectionCycleDto) throws Exception {
         SingleResult singleResult = new SingleResult();
         Integer result = 0;
         EntDeviceInsCycle entDeviceInsCycle = new EntDeviceInsCycle();
         BeanUtils.copyProperties(addOrUpdateDeviceInspectionCycleDto,entDeviceInsCycle);
+        Date nextTime = calculationDays(addOrUpdateDeviceInspectionCycleDto.getInspectionCycle());
+        entDeviceInsCycle.setNextTimeInspection(nextTime);
         if (null != addOrUpdateDeviceInspectionCycleDto && null != addOrUpdateDeviceInspectionCycleDto.getInspectionId()){
             result = entDeviceInsCycleMapper.updateDeviceInspectionCycle(entDeviceInsCycle);
         }else {
@@ -762,9 +767,9 @@ public class PcBusinessService extends BaseController {
     }
 
     @PageOperation
-    public SingleResult entEmEquipmentList(String enterpriseId,Integer page,Integer pageSize){
+    public SingleResult entEmEquipmentList(String enterpriseId,Integer page,Integer pageSize,String resourceType){
         SingleResult singleResult = new SingleResult();
-        Page<EntEmEquipment> entEmEquipments = (Page<EntEmEquipment>) entEmEquipmentMapper.selectEntEmEquipmentList(enterpriseId);
+        Page<EntEmEquipment> entEmEquipments = (Page<EntEmEquipment>) entEmEquipmentMapper.selectEntEmEquipmentList(enterpriseId,resourceType);
         singleResult.setDataPager(entEmEquipments);
         return singleResult;
     }
@@ -812,9 +817,9 @@ public class PcBusinessService extends BaseController {
     }
 
     @PageOperation
-    public  SingleResult entEmReservePlanList(String enterpriseId,Integer page,Integer pageSize){
+    public  SingleResult entEmReservePlanList(String enterpriseId,Integer page,Integer pageSize,String entEmReservePlanName){
         SingleResult singleResult = new SingleResult();
-        Page<EntEmReservePlan>list = (Page<EntEmReservePlan>) entEmReservePlanMapper.selectEntEmReservePlanList(enterpriseId);
+        Page<EntEmReservePlan>list = (Page<EntEmReservePlan>) entEmReservePlanMapper.selectEntEmReservePlanList(enterpriseId,entEmReservePlanName);
         singleResult.setDataPager(list);
         return singleResult;
     }
@@ -837,9 +842,9 @@ public class PcBusinessService extends BaseController {
     }
 
     @PageOperation
-    public SingleResult entEmRehearsalList(String enterpriseId,Integer page,Integer pageSize) throws Exception{
+    public SingleResult entEmRehearsalList(String enterpriseId,Integer page,Integer pageSize,String entEmRehearsalProject) throws Exception{
         SingleResult singleResult = new SingleResult();
-        Page<EntEmRehearsal>entEmRehearsals = (Page<EntEmRehearsal>) entEmRehearsalMapper.selectEntEmRehearsalList(enterpriseId);
+        Page<EntEmRehearsal>entEmRehearsals = (Page<EntEmRehearsal>) entEmRehearsalMapper.selectEntEmRehearsalList(enterpriseId,entEmRehearsalProject);
         singleResult.setDataPager(entEmRehearsals);
         return singleResult;
     }
@@ -862,10 +867,56 @@ public class PcBusinessService extends BaseController {
         return singleResult;
     }
 
+    public SingleResult entEmRehearsalDelete(String id)throws Exception{
+        SingleResult singleResult  =  new SingleResult();
+        int  result = entEmRehearsalMapper.updateDelState(id);
+        if (result != 1){
+            singleResult.setCode(Code.ERROR.getCode());
+            singleResult.setMessage(Message.ERROR);
+        }
+        return singleResult;
+    }
+
+    public SingleResult entEmReservePlanDelete(String id)throws Exception{
+        SingleResult singleResult  =  new SingleResult();
+        int  result = entEmReservePlanMapper.updateDelState(id);
+        if (result != 1){
+            singleResult.setCode(Code.ERROR.getCode());
+            singleResult.setMessage(Message.ERROR);
+        }
+        return singleResult;
+    }
 
 
+    public SingleResult entEmExpertDelete(String id){
+        SingleResult singleResult  =  new SingleResult();
+        int  result = entEmExpertMapper.updateDelState(id);
+        if (result != 1){
+            singleResult.setCode(Code.ERROR.getCode());
+            singleResult.setMessage(Message.ERROR);
+        }
+        return singleResult;
+    }
 
 
+    public  SingleResult entEmEquipmentDelete(String id){
+        SingleResult singleResult = new SingleResult();
+        int  result = entEmEquipmentMapper.updateDelState(id);
+        if (result != 1){
+            singleResult.setCode(Code.ERROR.getCode());
+            singleResult.setMessage(Message.ERROR);
+        }
+        return singleResult;
+    }
+
+    //向后加时间
+    private Date calculationDays(Integer day){
+        Calendar cal = Calendar.getInstance();
+        int amount = day;
+        cal.add(Calendar.DATE, amount);
+        Date date  = cal.getTime();
+        return date;
+    }
 
 
 

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

@@ -92,6 +92,8 @@ public class UserLoginService {
             entUser.setEnterpriseId(sysEnterprise.getSysenterpriseid());
             entUser.setToken(token);
             entUser.setEntPostName(entPost.getName());
+            entUser.setUserTypeName("企业用户");
+            entUser.setEnterpriseName(sysEnterprise.getEntname());
             return entUser;
     }
 }

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

@@ -1157,13 +1157,13 @@ public class PcCompanyController extends com.rzyc.controller.BaseController {
         }
         return result;
     }
+
+
     @ApiOperation("修改企业密码")
     @PostMapping("/entDetail/changePassword")
     @ResponseBody
     public SingleResult<String> changePassword(@Valid @RequestBody PasswordDto passwordDto){
         SingleResult<String> singleResult = new SingleResult<>();
-
-
         if (passwordDto.getPassword().matches(Constants.PASSWORD_REGULAR)){
             SysUser sysUser = sysUserMapper.findByEntId(passwordDto.getSysEnterpriseId());
             if(null != sysUser){