Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/CurrentStatusDto.java

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import lombok.Data;
+
+@Data
+public class CurrentStatusDto {
+    private String cutrentStatusName;
+    private Integer cutrentStatusCount;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DynamicFormInitDto.java

@@ -37,10 +37,13 @@ public class DynamicFormInitDto implements Serializable{
     @ApiModelProperty(value = "提交表单附加字段")
     private DynamicFormInstanceDto   formItemDescr;
     
-    @ApiModelProperty(value = "接口地址")
+    @ApiModelProperty(value = "配置")
     private String columnConfig;
     
     private int sort;
+
+  @ApiModelProperty(value = "接口地址")
+  private String url;
     
 	public DynamicFormInitDto() {
 		

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FailureRepairlogDto.java

@@ -24,7 +24,6 @@ public class FailureRepairlogDto extends BaseDto {
     @ApiModelProperty(value = "流程处理人Id")
     private Integer processAuditorId;
 
-
     @ApiModelProperty(value = "处理人所属部门")
     private String processDepartment;
 
@@ -41,6 +40,6 @@ public class FailureRepairlogDto extends BaseDto {
     private Long faultId;
 
     @ApiModelProperty(value = "流程处理人")
-    private String processAuditorCid;
+    private String processAuditorName;
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/StatusDto.java

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import lombok.Data;
+
+@Data
+public class StatusDto {
+    private Integer currentStatus;
+    private Integer currentStatusCount;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/UserUnitDto.java

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 单位归属
+ *
+ * @author gaojianqiang
+ * @date 2021-08-19
+ */
+@Data
+@ApiModel(value = "UserUnitDto", description = "用户单位归属")
+public class UserUnitDto {
+
+    @ApiModelProperty(value = "人员类型1-维保公司；2-业主单位")
+    private String identityType;
+
+    @ApiModelProperty(value = "人员id")
+    private String personSeq;
+
+    @ApiModelProperty(value = "人员名称")
+    private String personName;
+
+    @ApiModelProperty(value = "公司id")
+    private String companyId;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FailureRepairlog.java

@@ -62,6 +62,4 @@ public class FailureRepairlog extends BaseEntity {
 	@TableField("fault_id")
     private Long faultId;
 
-
-
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/UserRolesEnum.java

+package com.yeejoin.amos.boot.module.common.api.enums;
+
+public enum UserRolesEnum {
+
+    ADMIN("admin","机场单位"),
+    AIRPORTUNIT("AIRPORTUNIT","机场单位");
+
+    private String code;
+    private String name;
+
+    UserRolesEnum(String code, String name){
+        this.code = code;
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/UserUnitTypeEnum.java

+package com.yeejoin.amos.boot.module.common.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum UserUnitTypeEnum {
+    MAINTENANCE_COMPANY("1", "维保公司"),
+    OWNER_UNIT("2", "业主单位");
+
+    private String value;
+    private String name;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FailureDetailsMapper.java

 package com.yeejoin.amos.boot.module.common.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
+import com.yeejoin.amos.boot.module.common.api.dto.StatusDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FailureDetails;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  *  Mapper 接口
@@ -10,4 +19,28 @@ import com.yeejoin.amos.boot.module.common.api.entity.FailureDetails;
  * @date 2021-08-04
  */
 public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
+
+    /**
+     *查询全部 分页
+     * @param page
+     * @return
+     */
+    IPage<FailureDetails> selectAllPage(Page page);
+
+    /**
+     *查询我发起的 分页
+     * current 当前页
+     * size 条数
+     * @return
+     */
+    IPage<FailureDetails> selectISubPage(Page page, String submissionPid);
+
+    /**
+     *查询待处理 分页
+     * @param page
+     * @return
+     */
+    IPage<FailureDetails> selectInProcessing(Page page);
+
+    List<StatusDto> selectStatusCount();
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java

@@ -63,4 +63,11 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
 
     List< Map<String,Object>> getparent();
     List< OrgUsrExcelDto> exportToExcel();
+
+    /**
+     * 查询单位基本信息列表和单位下所有的重点部位数量。
+     */
+    List<OrgUsrTreeDto> getCompanyAndKeySite(Long companyId);
+
+    List<UserUnitDto>  getUserUnit(String id, String type, String code);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FailureDetailsMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.FailureDetailsMapper">
+    <select id="selectAllPage" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
+        SELECT
+            sequence_nbr,
+            current_status,
+            failure_equipment_id,
+            failure_equipment,
+            fault_time,
+            fault_phenomenon,
+            submission_name,
+            submission_pid,
+            biz_code,
+            submission_time,
+            submission_branch,
+            submission_branch_id
+        FROM
+            cb_failure_details
 
+    </select>
+
+    <select id="selectISubPage" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
+        SELECT
+            sequence_nbr,
+            current_status,
+            failure_equipment_id,
+            failure_equipment,
+            fault_time,
+            fault_phenomenon,
+            submission_name,
+            submission_pid,
+            biz_code,
+            submission_time,
+            submission_branch,
+            submission_branch_id
+        FROM
+            cb_failure_details
+        WHERE
+            submission_pid = #{submissionPid}
+
+    </select>
+
+    <select id="selectInProcessing" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
+        SELECT
+            sequence_nbr,
+            current_status,
+            failure_equipment_id,
+            failure_equipment,
+            fault_time,
+            fault_phenomenon,
+            submission_name,
+            submission_pid,
+            biz_code,
+            submission_time,
+            submission_branch,
+            submission_branch_id
+        FROM
+            cb_failure_details
+        WHERE
+            is_delete = 0
+    </select>
+
+    <select id="selectStatusCount" resultType="com.yeejoin.amos.boot.module.common.api.dto.StatusDto">
+        SELECT
+            cb_failure_details.current_status  ,
+            count(cb_failure_details.current_status)
+         AS currentStatusCount
+        FROM
+            cb_failure_details
+        GROUP BY
+            cb_failure_details.current_status
+    </select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -307,8 +307,28 @@ LEFT JOIN (
       FROM important_companys
 
     </select>
-
-
+    <select id="getUserUnit" resultType="com.yeejoin.amos.boot.module.common.api.dto.UserUnitDto">
+        SELECT
+            u.sequence_nbr AS personSeq,
+            u.biz_org_name AS personName,
+            '2' AS identityType,
+            IFNULL( LEFT ( u.biz_org_code, 6 ), '' ) AS companyId
+        FROM
+            `cb_org_usr` u
+        <where>
+            <if test="id != null and id != ''">
+                u.amos_org_id = #{id}
+            </if>
+            <if test="type != null and type != ''">
+                AND u.biz_org_type = #{type}
+            </if>
+            <if test="code != null and code != ''">
+                AND u.biz_org_code LIKE CONCAT(#{code}, '%')
+            </if>
+        </where>
+        ORDER BY
+            u.sequence_nbr DESC
+    </select>
     <select id="exportToExcel" resultType="com.yeejoin.amos.boot.module.common.api.dto.OrgUsrExcelDto">
          select
     a.biz_org_name bizOrgName,
@@ -335,5 +355,49 @@ LEFT JOIN (
     on b.instance_id=a.sequence_nbr where a.biz_org_name is not null
     </select>
 
+<select id="getCompanyAndKeySite" resultType="com.yeejoin.amos.boot.module.common.api.dto.OrgUsrTreeDto" >
+
+    SELECT
+        company_sur.sequence_nbr as sequenceNbr,
+        company_sur.biz_org_name as bizOrgName ,
+        company_sur.parent_id as parentId,
+        company_sur.biz_org_type as bizOrgType,
+--         cb.field_value_label,
+        CASE
+        WHEN keysite_sur.num IS NULL THEN
+            0
+        ELSE
+            keysite_sur.num
+        END AS num
+    FROM
+        (
+            SELECT
+                company.sequence_nbr,
+                company.parent_id,
+                company.biz_org_name,
+                company.biz_org_type
+            FROM
+                cb_org_usr company
+            WHERE
+                (company.biz_org_type = 'COMPANY' OR company.biz_org_type = 'DEPARTMENT')
+            AND company.is_delete = FALSE
+            <if test="companyId != null and companyId != ''">
+                AND biz_org_code LIKE CONCAT((SELECT biz_org_code FROM cb_org_usr WHERE sequence_nbr = #{companyId}),'%')
+            </if>
+        ) company_sur
+    LEFT JOIN (
+        SELECT
+            keysite.belong_id,
+        COUNT(keysite.belong_id) as num
+        FROM
+            cb_key_site keysite
+        WHERE
+         keysite.is_delete = FALSE
+        GROUP BY
+            keysite.belong_id
+    ) keysite_sur ON company_sur.sequence_nbr = keysite_sur.belong_id
+--     LEFT JOIN cb_dynamic_form_instance as cb ON company_sur.sequence_nbr = cb.instance_id where field_code = 'companyNature'
+
+</select>
 
 </mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FailureAuditController.java

@@ -49,8 +49,6 @@ public class FailureAuditController extends BaseController {
 		}
 	}
 
-
-
     /**
      * 根据sequenceNbr查询
      *
@@ -64,35 +62,6 @@ public class FailureAuditController extends BaseController {
 	    return ResponseHelper.buildResponse(failureAuditServiceImpl.queryBySeq(sequenceNbr));
 	}
 
-	/**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
-	public ResponseModel<Page<FailureAuditDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<FailureAuditDto> page = new Page<FailureAuditDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(failureAuditServiceImpl.queryForFailureAuditPage(page));
-	}
-
-	/**
-	 * 列表全部数据查询
-     *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<FailureAuditDto>> selectForList() {
-	    return ResponseHelper.buildResponse(failureAuditServiceImpl.queryForFailureAuditList());
-	}
 
 	/**
 	 * 审核列表记录查询

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FailureDetailsController.java

@@ -181,8 +181,8 @@ public class FailureDetailsController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "查询当前状态任务数量",   notes = "查询当前状态任务数量")
 	@GetMapping(value = "/list/count")
-	public ResponseModel<List<FailureStatusCountDto>> selectStatusCount(@RequestParam Integer type) {
-		return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryStatusCount(type));
+	public ResponseModel<Object> selectStatusCount() {
+		return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryStatusCount());
 	}
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FailureMaintainController.java

@@ -2,23 +2,23 @@ package com.yeejoin.amos.boot.module.common.biz.controller;
 
 import java.util.List;
 
-import com.yeejoin.amos.boot.module.common.api.entity.FailureAudit;
+
 import com.yeejoin.amos.boot.module.common.api.entity.FailureMaintain;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
+
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+
 import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureMaintainDto;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FailureMaintainServiceImpl;
@@ -59,71 +59,6 @@ public class FailureMaintainController extends BaseController {
 	}
 
 	/**
-     * 根据sequenceNbr更新
-	 * 根据传递的Status状态确认验收状态
-     *
-     *
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/verify")
-	@ApiOperation(httpMethod = "PUT", value = "验收操作", notes = "根据sequenceNbr更新")
-	public Object updateBySequenceNbrFailureMaintain(@RequestBody FailureMaintainDto model) {
-		try {
-			return ResponseHelper.buildResponse(failureMaintainServiceImpl.updateModel(model,getSelectedOrgInfo()));
-		} catch (Exception e) {
-			e.printStackTrace();
-			return ResponseHelper.buildResponse(false);
-		}
-	}
-
-
-/*
-	*/
-/**
-	 * 根据sequenceNbr更新
-	 * 根据传递的Status状态确认验收状态
-	 *
-	 * @param sequenceNbr 主键
-	 * @return
-	 *//*
-
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/update/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "维修完成", notes = "根据sequenceNbr更新")
-	public Object updateByFailureMaintain(@RequestBody FailureMaintainDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr)  {
-		model.setSequenceNbr(sequenceNbr);
-
-		try {
-			return ResponseHelper.buildResponse(failureMaintainServiceImpl.updateStatus(model,getSelectedOrgInfo()));
-		} catch (Exception e) {
-			return ResponseHelper.buildResponse(false);
-		}
-	}
-*/
-
-
-
-	/**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
-	public ResponseModel<Page<FailureMaintainDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<FailureMaintainDto> page = new Page<FailureMaintainDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(failureMaintainServiceImpl.queryForFailureMaintainPage(page));
-	}
-
-
-	/**
 	 * 维修列表记录查询
 	 *根据关联主表faultId查询
 	 * @return

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DynamicFormColumnServiceImpl.java

@@ -66,6 +66,7 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
 
     		QueryWrapper<DynamicFormColumn> queryWrapper = new QueryWrapper<>();
     		queryWrapper.eq("group_code", code);
+				queryWrapper.eq("is_delete", false);
     		queryWrapper.orderByAsc("sort");
     		List<DynamicFormColumn> dynamicFormColumn = this.list(queryWrapper);
     		List<DynamicFormInitDto> listForm = new ArrayList<DynamicFormInitDto>();
@@ -76,9 +77,9 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
     					dynamicForm.getFieldType().equals("string") || 
     					dynamicForm.getFieldType().equals("datetime") || 
     					dynamicForm.getFieldType().equals("textarea") || 
-    					dynamicForm.getFieldType().equals("upload") || 
-    					dynamicForm.getFieldType().equals("tagging") || 
-    					dynamicForm.getFieldType().equals("inputBitmap")) {
+    					dynamicForm.getFieldType().equals("upload") ||
+							dynamicForm.getFieldType().equals("tagging") ||
+							dynamicForm.getFieldType().equals("inputBitmap")) {
 
     				DynamicFormInitDto vo = new DynamicFormInitDto(dynamicForm.getFieldCode(), dynamicForm.getFieldName(),
     						dynamicForm.getFieldType(), new SelectItems(), null);
@@ -161,6 +162,20 @@ public class DynamicFormColumnServiceImpl extends BaseService<DynamicFormColumnD
 	    				vo.setSort(dynamicFormValue.getSort());
 	    				listForm.add(vo);
 						break;
+						case "url":
+								vo = new DynamicFormInitDto(dynamicForm.getFieldCode(), dynamicForm.getFieldName(),
+										dynamicForm.getFieldType(), new SelectItems(new ArrayList<>()), columnConfigJson.toJSONString());
+							  vo.setUrl(columnConfigJson.getString("url"));
+								dynamicFormValue = new DynamicFormInstanceDto();
+								BeanUtils.copyProperties(dynamicForm, dynamicFormValue);
+								dynamicFormValue.setSequenceNbr(null);
+								dynamicFormValue.setFormColumnId(dynamicForm.getSequenceNbr());
+								dynamicFormValue.setAppKey(appKey);
+
+								vo.setFormItemDescr(dynamicFormValue);
+								vo.setSort(dynamicFormValue.getSort());
+								listForm.add(vo);
+								break;
 					default:
 						vo = new DynamicFormInitDto(dynamicForm.getFieldCode(), dynamicForm.getFieldName(),
 	    						dynamicForm.getFieldType(), new SelectItems(new ArrayList<>()), null);

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureAuditServiceImpl.java

@@ -44,21 +44,7 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
     @Autowired
     FailureRepairlogServiceImpl failureRepairlogService;
 
-    private final Logger logger = LoggerFactory.getLogger(FailureAuditServiceImpl.class);
 
-    /**
-     * 分页查询
-     */
-    public Page<FailureAuditDto> queryForFailureAuditPage(Page<FailureAuditDto> page) {
-        return this.queryForPage(page, null, false);
-    }
-
-    /**
-     * 列表查询 示例
-     */
-    public List<FailureAuditDto> queryForFailureAuditList() {
-        return this.queryForList("", false);
-    }
 
     /**
      * 发起审核
@@ -75,23 +61,23 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
         FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId());
 
         int auditResult = 0;
-
+        Boolean repairResult = null;
         //根据审核的结果进行业务操作
         if (condition == AuditResultEnum.AGREE.getCode() && userInfo.getDepartment().getSequenceNbr().equals(failureDetailsDto.getBizCode())) {
             auditResult = AuditResultEnum.AGREE.getCode();
-            Boolean repairResult = updateStatus(model, FailureStatuEnum.WAITING_AUDIT, userInfo, condition);
+            repairResult = updateStatus(model, FailureStatuEnum.WAITING_AUDIT, userInfo, condition);
         } else if (condition == (AuditResultEnum.REFUSE.getCode())) {
             auditResult = AuditResultEnum.REFUSE.getCode();
-            Boolean repairResult = updateStatus(model, FailureStatuEnum.REFUSE, userInfo, condition);
+            repairResult = updateStatus(model, FailureStatuEnum.REFUSE, userInfo, condition);
         } else if (condition == (AuditResultEnum.SEND_BACK.getCode())) {
             auditResult = AuditResultEnum.SEND_BACK.getCode();
-            Boolean repairResult = updateStatus(model, FailureStatuEnum.WAITING_SUBMIT, userInfo, condition);
+            repairResult = updateStatus(model, FailureStatuEnum.WAITING_SUBMIT, userInfo, condition);
         } else if (condition == AuditResultEnum.AGREE.getCode()) {
             auditResult = AuditResultEnum.AGREE.getCode();
-            Boolean repairResult = updateStatus(model, FailureStatuEnum.WAITING_MAINTAIN, userInfo, condition);
+            repairResult = updateStatus(model, FailureStatuEnum.WAITING_MAINTAIN, userInfo, condition);
         }
 
-        if (ObjectUtils.isEmpty(auditResult)) {
+        if (!repairResult) {
             throw new Exception("添加报修日志失败");
         }
         model.setAuditResult(auditResult);
@@ -115,7 +101,7 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
         //当前角色部门id为维修部门的时候 修改状态
         failureDetailsDto.setCurrentStatus(status.getCode());
         failureDetailsDto.setSequenceNbr(model.getFaultId());
-        FailureDetailsDto failureDetailsDtos = failureDetailsService.updateWithModel(failureDetailsDto);
+         failureDetailsService.updateWithModel(failureDetailsDto);
 
         String conditionText;
         boolean result = failureDetailsService.checkExcuteTaskAuth(failureDetailsDto.getSequenceNbr(), userInfo);
@@ -124,19 +110,18 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
             Long faultId = model.getFaultId();
             Date processTime = model.getAuditTime();
             String processDepartment = model.getAuditDepartment();
-          //  String processAuditor = model.getAuditor();
             Integer processAuditorId = Integer.parseInt(userInfo.getUserModel().getUserId());
-            String processAuditorCid = userInfo.getRole().getRoleName();
+            String processAuditorName = userInfo.getUserModel().getRealName();
             Long auditDepartmentId = (userInfo.getDepartment().getSequenceNbr());
             if (condition == AuditResultEnum.AGREE.getCode()) {
                 conditionText = AuditResultEnum.AGREE.getName();
-                repairlog(faultId,  processAuditorId, auditDepartmentId, processTime, processDepartment, conditionText, processAuditorCid);
+                repairlog(faultId,  processAuditorId, auditDepartmentId, processTime, processDepartment, conditionText, processAuditorName);
             } else if (condition == AuditResultEnum.SEND_BACK.getCode()) {
                 conditionText = AuditResultEnum.SEND_BACK.getName();
-                repairlog(faultId,  processAuditorId, auditDepartmentId, processTime, processDepartment, conditionText, processAuditorCid);
+                repairlog(faultId,  processAuditorId, auditDepartmentId, processTime, processDepartment, conditionText, processAuditorName);
             } else if (condition == AuditResultEnum.REFUSE.getCode()) {
                 conditionText = AuditResultEnum.REFUSE.getName();
-                repairlog(faultId,  processAuditorId, auditDepartmentId, processTime, processDepartment, conditionText, processAuditorCid);
+                repairlog(faultId,  processAuditorId, auditDepartmentId, processTime, processDepartment, conditionText, processAuditorName);
             }
             if (failureDetailsService.excuteTask(failureDetailsDto.getProcessId(), userInfo, condition + "")){
                 return true;
@@ -152,7 +137,7 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
      */
     @Transactional
     public Boolean repairlog(Long faultId,  Integer processAuditorId, Long departmentId, Date processTime,
-                             String processDepartment, String processResult, String processAuditorCid) {
+                             String processDepartment, String processResult, String processAuditorName) {
         FailureRepairlogDto failureRepairlogDto = new FailureRepairlogDto();
         failureRepairlogDto.setFaultId(faultId);
         failureRepairlogDto.setProcessAuditorId(processAuditorId);
@@ -160,7 +145,7 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
         failureRepairlogDto.setProcessTime(processTime);
         failureRepairlogDto.setProcessDepartment(processDepartment);
         failureRepairlogDto.setProcessResult(processResult);
-        failureRepairlogDto.setProcessAuditorCid(processAuditorCid);
+        failureRepairlogDto.setProcessAuditorName(processAuditorName);
         failureRepairlogService.createWithModel(failureRepairlogDto);
         if (ObjectUtils.isNotEmpty(failureRepairlogDto)) {
             return true;

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureMaintainServiceImpl.java

@@ -76,8 +76,6 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
     WorkflowFeignService workflowFeignService;
     private static String RECORE_TYPE = "维修记录";
 
-    private final Logger logger = LoggerFactory.getLogger(FailureMaintainServiceImpl.class);
-
     private static String[] MAINTENANCE_STATUS = {"维修完成", "维修中"};
 
     private static int MAINTENANCE_COMPLETE = 0;
@@ -86,25 +84,7 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
 
     private static String[] PROCESS_RESULT = {"验证通过", "验证未通过"};
 
-    /**
-     * 分页查询
-     */
-
-    public Page<FailureMaintainDto> queryForFailureMaintainPage(Page<FailureMaintainDto> page) {
 
-        return this.queryForPage(page, null, false);
-
-    }
-
-    /**
-     * 列表查询 示例
-     */
-
-    public List<FailureMaintainDto> queryForFailureMaintainList() {
-
-        return this.queryForList("", false);
-
-    }
 
     /**
      * 添加维修记录
@@ -132,10 +112,10 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
             // 添加报修日志
             String processResult = MAINTENANCE_STATUS[1];// 维修中
             Integer processAuditorId = Integer.parseInt(failureMaintainDto.getRecUserId());
-            String processAuditorCid = userInfo.getRole().getRoleName();
+            String processAuditorName = userInfo.getUserModel().getRealName();
             repairlog(failureMaintainDto.getFaultId(), processAuditorId,
                     userInfo.getDepartment().getSequenceNbr(), failureMaintainDto.getMaintainTime(),
-                    failureMaintainDto.getDepartment(), processResult, processAuditorCid);
+                    failureMaintainDto.getDepartment(), processResult, processAuditorName);
             if (ObjectUtils.isNotEmpty(failureMaintainDto.getAttachment())) {
                 sourceFileServiceImpl.saveSourceFile(failureMaintainDto.getSequenceNbr(),
                         failureMaintainDto.getAttachment());
@@ -179,10 +159,10 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
             // 添加报修日志
             String processResult = MAINTENANCE_STATUS[0];// 维修完成
             Integer processAuditorId = Integer.parseInt(failureMaintainDto.getRecUserId());
-            String processAuditorCid = userInfo.getRole().getRoleName();
+            String processAuditorName = userInfo.getUserModel().getRealName();
             repairlog(failureMaintainDto.getFaultId(),  processAuditorId,
                     userInfo.getDepartment().getSequenceNbr(), failureMaintainDto.getMaintainTime(),
-                    failureMaintainDto.getDepartment(), processResult, processAuditorCid);
+                    failureMaintainDto.getDepartment(), processResult, processAuditorName);
             if (ObjectUtils.isNotEmpty(failureMaintainDto.getAttachment())) {
                 sourceFileServiceImpl.saveSourceFile(failureMaintainDto.getSequenceNbr(),
                         failureMaintainDto.getAttachment());
@@ -195,55 +175,6 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
         return true;
     }
 
-    /**
-     * 根据审核结果更新维修表
-     */
-
-    public Boolean updateModel(FailureMaintainDto failureMaintainDto,  ReginParams userInfo) throws Exception {
-        boolean result = failureDetailsService.checkExcuteTaskAuth(failureMaintainDto.getFaultId(), userInfo);
-        FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(failureMaintainDto.getFaultId());
-
-        if (result) {
-            this.updateWithModel(failureMaintainDto);
-            // 根据status修改状态
-            String processResult = new String();
-            String condition = failureMaintainDto.getCondition();
-            int conditionStatus = Integer.parseInt(condition);
-
-            if (conditionStatus == AuditResultEnum.AGREE.getCode() && userInfo.getDepartment().getSequenceNbr()
-                    == failureDetailsDto.getBizCode()) {// 同意状态为已完结
-                processResult = PROCESS_RESULT[0];
-            } else if (conditionStatus == AuditResultEnum.AGREE.getCode()) {// 同意状态为已完结
-                failureDetailsDto.setCurrentStatus(failureDetailsDto.getCurrentStatus());
-                failureDetailsService.updateWithModel(failureDetailsDto);
-                processResult = PROCESS_RESULT[0];
-            } else if (conditionStatus == AuditResultEnum.REFUSE.getCode()){// 不同意状态为已拒绝
-                failureDetailsDto.setCurrentStatus(FailureStatuEnum.REFUSE.getCode());
-                failureDetailsService.updateWithModel(failureDetailsDto);
-                processResult = PROCESS_RESULT[1];
-            }
-
-            // 添加报修日志
-            Integer processAuditorId = Integer.parseInt(failureMaintainDto.getRecUserId());
-            String processAuditorCid = userInfo.getRole().getRoleName();
-
-            Boolean repairlog = repairlog(failureMaintainDto.getFaultId(), processAuditorId,
-                    userInfo.getDepartment().getSequenceNbr(), failureMaintainDto.getMaintainTime(),
-                    failureMaintainDto.getDepartment(), processResult, processAuditorCid);
-            if (ObjectUtils.isEmpty(repairlog)){
-                throw new RuntimeException("验收添加报修日志出错");
-            }
-
-           if (failureDetailsService.excuteTask(failureMaintainDto.getFaultId(), userInfo, condition)){
-               return true;
-           }else {
-               throw new RuntimeException("验收执行流程失败");
-           }
-        }
-        return false;
-
-    }
-
 
     /**
      * 根据FaultId查询
@@ -273,9 +204,7 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
      * 添加报修日志
      */
     public Boolean repairlog(Long faultId,  Integer processAuditorId, Long departmentId,
-                             Date processTime,
-
-                             String processDepartment, String processResult, String processAuditorCid) {
+                             Date processTime, String processDepartment, String processResult, String processAuditorName) {
 
         FailureRepairlogDto failureRepairlogDto = new FailureRepairlogDto();
         failureRepairlogDto.setFaultId(faultId);
@@ -284,7 +213,7 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
         failureRepairlogDto.setProcessTime(processTime);
         failureRepairlogDto.setProcessDepartment(processDepartment);
         failureRepairlogDto.setProcessResult(processResult);
-        failureRepairlogDto.setProcessAuditorCid(processAuditorCid);
+        failureRepairlogDto.setProcessAuditorName(processAuditorName);
         failureRepairlogService.createWithModel(failureRepairlogDto);
         if (ObjectUtils.isNotEmpty(failureRepairlogDto)) {
             return true;

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureVerifyServiceImpl.java

@@ -66,33 +66,21 @@ public class FailureVerifyServiceImpl extends BaseService<FailureVerifyDto, Fail
         }
         Boolean repairResult = null;
         //根据验收的结果进行业务操作
-     /*   if (condition == AuditResultEnum.AGREE.getCode() ) {
-            verifyResult = AuditResultEnum.AGREE.getCode();
-            Boolean repairResult = updateStatus(model, FailureStatuEnum.WAITING_ACCEPTANCE, userInfo, condition);
-        } else*/
         if (condition == (AuditResultEnum.REFUSE.getCode())) {
             verifyResult = AuditResultEnum.REFUSE.getCode();
             repairResult = updateStatus(model, FailureStatuEnum.REFUSE, userInfo, condition);
-        } /*else if (condition == (AuditResultEnum.SEND_BACK.getCode())) {
-            verifyResult = AuditResultEnum.SEND_BACK.getCode();
-            Boolean repairResult = updateStatus(model, FailureStatuEnum.WAITING_SUBMIT, userInfo, condition);
-        } */ else if (condition == AuditResultEnum.AGREE.getCode()) {
+        }  else if (condition == AuditResultEnum.AGREE.getCode()) {
             verifyResult = AuditResultEnum.AGREE.getCode();
             repairResult = updateStatus(model, FailureStatuEnum.FINISH, userInfo, condition);
         }
 
         model.setVerifyResult(verifyResult);
 
-        List<FailureVerify> byfaultId = findByfaultId(failureDetailsDto.getSequenceNbr());
-
-      /*  if (byfaultId.size() == 0) {
-            this.createWithModel(model);
-        } else {*/
             this.createWithModel(model);
             if (!failureDetailsService.excuteTask(failureDetailsDto.getSequenceNbr(), userInfo, condition + "")) {
                 throw new Exception("执行流程失败");
             }
-     /*   }*/
+
         return true;
     }
 
@@ -154,7 +142,7 @@ public class FailureVerifyServiceImpl extends BaseService<FailureVerifyDto, Fail
         failureRepairlogDto.setProcessTime(processTime);
         failureRepairlogDto.setProcessDepartment(processDepartment);
         failureRepairlogDto.setProcessResult(processResult);
-        failureRepairlogDto.setProcessAuditorCid(processVerifyorCid);
+        failureRepairlogDto.setProcessAuditorName(processVerifyorCid);
         failureRepairlogService.createWithModel(failureRepairlogDto);
         if (ObjectUtils.isNotEmpty(failureRepairlogDto)) {
             return true;
@@ -166,7 +154,6 @@ public class FailureVerifyServiceImpl extends BaseService<FailureVerifyDto, Fail
      * 根据FaultId查询
      */
     public List<FailureVerify> findByfaultId(Long faultId) {
-        Page<FailureVerify> page = new Page<>();
         QueryWrapper<FailureVerify> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("fault_id", faultId).orderByDesc("verify_time");
         return baseMapper.selectList(queryWrapper);

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.component.event.RestEventTrigger;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -27,7 +28,6 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -294,6 +294,7 @@ public class AlertCalledController extends BaseController {
     @PostMapping(value = "/billsend")
     @ApiOperation(httpMethod = "POST", value = "设备联动紧急响应", notes = "启动所有消防队伍的警铃、广播，并自动开启所有车库门")
     @Transactional
+    @RestEventTrigger(value = "opreateLogEventHandler")
     public ResponseModel<Boolean> controlEquip() throws Exception{
 
     	return ResponseHelper.buildResponse(iAlertCalledService.controlEquip());

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/event/OpreateLogEventHandler.java

+package com.yeejoin.amos.boot.module.jcs.biz.controller.event;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.OperateLogModel;
+
+import org.springframework.stereotype.Component;
+import org.typroject.tyboot.component.event.RestEvent;
+import org.typroject.tyboot.component.event.RestEventHandler;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+
+/**
+ * 
+ * <pre>
+ * controller层操作日志事件监听
+ * </pre>
+ *
+ * @author gwb
+ * @version $Id: OpreateLogEventHandler.java, v 0.1 2021年8月19日 下午6:38:36 gwb Exp $
+ */
+@Component("opreateLogEventHandler")
+public class OpreateLogEventHandler extends RestEventHandler {
+
+    static ObjectMapper objectMapper = new ObjectMapper();
+
+    @Override
+    protected void handleEvent(RestEvent restEvent) throws Exception {
+
+        OperateLogModel operateLogModel =new OperateLogModel();
+        operateLogModel.setMethodLabel(restEvent.getMethodLabel());
+        operateLogModel.setMethodName(restEvent.getMethodName());
+        operateLogModel.setParams(objectMapper.writeValueAsString(restEvent.getParams()));
+        operateLogModel.setResult(objectMapper.writeValueAsString(restEvent.getSource()));
+        operateLogModel.setUserId(restEvent.getRequestContextModel().getExcutedUserId());
+        operateLogModel.setRemoteIp(restEvent.getRequestContextModel().getRequestIP());
+        operateLogModel.setToken(restEvent.getRequestContextModel().getToken());
+        operateLogModel.setTraceId(restEvent.getRequestContextModel().getTraceId());
+        operateLogModel.setAgencyCode(restEvent.getRequestContextModel().getAgencyCode());
+        operateLogModel.setAppCode(restEvent.getRequestContextModel().getAppKey());
+        
+        
+        RequestContext.setAppKey(restEvent.getRequestContextModel().getAppKey());
+        RequestContext.setProduct(restEvent.getRequestContextModel().getProduct());
+        RequestContext.setToken(restEvent.getRequestContextModel().getToken());
+        
+        Systemctl.operateLogClient.create(operateLogModel);
+    }
+}

amos-boot-module/amos-boot-module-biz/pom.xml

@@ -13,7 +13,21 @@
 	<packaging>pom</packaging>
 
 	<dependencies>
-
+		<dependency>
+			<groupId>org.typroject</groupId>
+			<artifactId>tyboot-component-event</artifactId>
+			<version>${tyboot-version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.typroject</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>io.springfox</groupId>
+					<artifactId>springfox-swagger2</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 	</dependencies>
 
 	<modules>

amos-boot-system-jcs/src/main/resources/application.properties

-spring.application.name=JCS_chenhao
-server.servlet.context-path=/jcs
+spring.application.name=JCS_cz
 server.port=11100
 spring.profiles.active=dev
 

amos-boot-system-maintenance/src/main/resources/db/changelog/mt-sql-task.xml

@@ -24,6 +24,12 @@
 			end if;
 			END
 		</createProcedure>
-
+	</changeSet>
+	<changeSet author="suhuiguang" id="1629352951339-1" runOnChange="true">
+		<sql>
+			DROP TRIGGER  IF EXISTS `addPointConfig`;
+			DROP TRIGGER  IF EXISTS `updatePointConfig`;
+			DROP TRIGGER  IF EXISTS `updatePointConfig`;
+		</sql>
 	</changeSet>
 </databaseChangeLog>
\ No newline at end of file