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/entity/FirefightersContract.java

@@ -41,6 +41,11 @@ public class FirefightersContract extends BaseEntity {
     @ApiModelProperty(value = "签订日期")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date signedTime;
+    
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "起始时间")
+    private Date startTime;
+    
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "到期时间")
     private Date expireTime;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java

@@ -181,7 +181,7 @@ public interface IOrgUsrService {
 
     List<OrgUsrExcelDto> exportToExcel();
 
-    UserUnitDto getUserUnit(String id, String type, String code);
+    UserUnitDto getUserUnit(String userId);
 
 	/**
 	 * 根据登陆人获取公司部门人员树

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/PowerTransferResourceDto.java

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+* 调派资源dto
+*
+* @author tb
+* @date 2021-08-20
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="PowerTransferResourceDto", description="调派资源dto")
+public class PowerTransferResourceDto extends BaseDto {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "资源名称")
+    private String name;
+
+    @ApiModelProperty(value = "资源类型（中队：company，车辆：car，人员：person）")
+    private String type;
+
+    @ApiModelProperty(value = "地址")
+    private String address;
+
+    @ApiModelProperty(value = "图片")
+    private String img;
+
+    @ApiModelProperty(value = "联系电话")
+    private String tel;
+
+    @ApiModelProperty(value = "负责人")
+    private String chargePerson;
+
+    @ApiModelProperty(value = "驾驶员")
+    private String driver;
+
+    @ApiModelProperty(value = "车辆状态")
+    private String carState;
+
+    @ApiModelProperty(value = "岗位")
+    private String post;
+
+    @ApiModelProperty(value = "性别")
+    private String gender;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/enums/FireCarStatusEnum.java

@@ -23,4 +23,13 @@ public enum FireCarStatusEnum {
     private String key;
     private String code;
     private String name;
+
+    public static FireCarStatusEnum getEnum(String code) {
+        for (FireCarStatusEnum status : FireCarStatusEnum.values()) {
+            if (status.getCode().equals(code)) {
+                return status;
+            }
+        }
+        return null;
+    }
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/PowerTransferMapper.java

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.jcs.api.dto.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerCarCountDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerCompanyCountDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerData;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyResourcesDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferResourceDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
 import org.apache.ibatis.annotations.Param;
 
@@ -76,4 +84,24 @@ public interface PowerTransferMapper extends BaseMapper<PowerTransfer> {
     List<PowerCompanyCountDto> getPowerCompanyCountDtocount(@Param("id") Long id);
 
     List<PowerCarCountDto> getPowerCarCountDtocount(@Param("alertCalledId") Long alertCalledId,@Param("companyId") Long companyId);
+
+    /**
+     * 根据参数获取警情当前已调派队伍资源列表信息
+     *
+     * @param alertCalledId 警情id
+     * @param page          分页参数
+     * @return
+     */
+    IPage<PowerTransferResourceDto> getPowerTransferTeamResource(Page<PowerTransferResourceDto> page,
+                                                                 @Param("alertCalledId") Long alertCalledId);
+
+    /**
+     * 根据参数获取警情当前已调派车辆资源列表信息
+     *
+     * @param alertCalledId 警情id
+     * @param page          分页参数
+     * @return
+     */
+    IPage<PowerTransferResourceDto> getPowerTransferCarResource(Page<PowerTransferResourceDto> page,
+                                                                @Param("alertCalledId") Long alertCalledId);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IPowerTransferService.java

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.common.api.dto.FireBrigadeResourceDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerCompanyCountDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferResourceDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferSimpleDto;
 
@@ -30,4 +33,14 @@ public interface IPowerTransferService extends IService<PowerTransfer> {
      */
     List<FireBrigadeResourceDto> getPowerTree();
     List<PowerCompanyCountDto> getPowerCompanyCountDtocount( Long id);
+
+    /**
+     * 根据参数查询力量调派资源列表
+     *
+     * @param alertCalledId 警情id
+     * @param type 查询类型
+     * @param page 分页参数
+     * @return
+     */
+    IPage<PowerTransferResourceDto> getPowerTransferPageByParam(Long alertCalledId, String type, Page<PowerTransferResourceDto> page);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/PowerTransferMapper.xml

@@ -192,21 +192,38 @@
     GROUP BY
         c.resources_name ) m where m.carNum>0
     </select>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    <select id="getPowerTransferTeamResource"
+            resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferResourceDto">
+        SELECT distinct
+            company.company_id sequenceNbr,
+            company.company_name NAME,
+            'company' type,
+            team.address,
+            team.contact_user chargePerson,
+            team.contact_phone tel,
+            team.img
+        FROM
+            jc_power_transfer_company company
+                LEFT JOIN jc_power_transfer transfer ON transfer.sequence_nbr = company.power_transfer_id
+                LEFT JOIN cb_fire_team team ON team.sequence_nbr = company.company_id
+        WHERE
+            transfer.alert_called_id = #{alertCalledId}
+            AND is_distribution_agencies = 0
+    </select>
+    <select id="getPowerTransferCarResource"
+            resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferResourceDto">
+        SELECT DISTINCT
+            car.resources_id sequenceNbr,
+            car.resources_name,
+            'car' type
+        FROM
+            jc_power_transfer_company_resources car
+                LEFT JOIN jc_power_transfer_company company ON company.sequence_nbr = car.power_transfer_company_id
+                LEFT JOIN jc_power_transfer transfer ON transfer.sequence_nbr = company.power_transfer_id
+        WHERE
+            transfer.alert_called_id = #{alertCalledId}
+          AND is_distribution_agencies = 0
+    </select>
 
 
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/core/common/request/AddPlanRequest.java

+package com.yeejoin.amos.supervision.core.common.request;
+
+import com.yeejoin.amos.supervision.dao.entity.Plan;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AddPlanRequest {
+    private List<Long> ownerId;
+    private Plan plan;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/core/common/response/PlanPointRespone.java

+package com.yeejoin.amos.supervision.core.common.response;
+
+import com.yeejoin.amos.supervision.dao.entity.Plan;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PlanPointRespone {
+    private static final long serialVersionUID = 1L;
+
+    private List<Long> ownerId;
+    private Plan plan;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/dao/entity/InputItem.java

@@ -203,6 +203,7 @@ public class InputItem extends BasicEntity {
     /**
      * 适用检查类别
      */
+    @Lob
     @Column(name="item_type_classify")
     private String itemTypeClassify;
 
@@ -216,13 +217,13 @@ public class InputItem extends BasicEntity {
      * 检查项启用
      */
     @Column(name="item_start")
-    private String itemStart;
+    private Integer itemStart;
 
-    public String getItemStart() {
+    public Integer getItemStart() {
         return itemStart;
     }
 
-    public void setItemStart(String itemStart) {
+    public void setItemStart(Integer itemStart) {
         this.itemStart = itemStart;
     }
 

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/dao/entity/Plan.java

@@ -5,6 +5,7 @@ import java.util.Date;
 
 import javax.persistence.*;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.data.annotation.LastModifiedDate;
 
 
@@ -266,6 +267,56 @@ public class Plan extends BasicEntity {
 	@Column(name="user_dept")
 	private String userDept;
 
+	/**
+	 * 牵头部门
+	 */
+	@Column(name="lead_department_ids")
+	private String leadDepartmentIds;
+
+	/**
+	 * 牵头人名称，多个
+	 */
+	@Column(name="lead_people_names")
+	private String leadPeopleNames;
+
+	/**
+	 * 牵头人
+	 */
+	@Column(name="lead_people_ids")
+	private String leadPeopleIds;
+
+	/**
+	 * 牵头部门名称
+	 */
+	@Column(name="lead_department_names")
+	private String leadDepartmentNames;
+
+	/**
+	 * 参与人
+	 */
+	@Column(name="join_person_ids")
+	private String joinPersonIds;
+
+	/**
+	 * 参与人名称
+	 */
+	@Column(name="join_person_names")
+	private String joinPersonNames;
+
+	/**
+	 * 检查类型id
+	 */
+	@Column(name="check_type_id")
+	private String checkTypeId;
+
+	/**
+	 * 检查类型名称
+	 */
+	@Column(name="check_type_name")
+	private String checkTypeName;
+
+
+
 	public String getUserDept() {
 		return userDept;
 	}
@@ -616,4 +667,68 @@ public class Plan extends BasicEntity {
 	public void setIsSingleExecution(boolean isSingleExecution) {
 		this.isSingleExecution = isSingleExecution;
 	}
+
+	public String getCheckTypeName() {
+		return checkTypeName;
+	}
+
+	public void setCheckTypeName(String checkTypeName) {
+		this.checkTypeName = checkTypeName;
+	}
+
+	public String getCheckTypeId() {
+		return checkTypeId;
+	}
+
+	public void setCheckTypeId(String checkTypeId) {
+		this.checkTypeId = checkTypeId;
+	}
+
+	public String getLeadDepartmentNames() {
+		return leadDepartmentNames;
+	}
+
+	public void setLeadDepartmentNames(String leadDepartmentNames) {
+		this.leadDepartmentNames = leadDepartmentNames;
+	}
+
+	public String getLeadPeopleIds() {
+		return leadPeopleIds;
+	}
+
+	public void setLeadPeopleIds(String leadPeopleIds) {
+		this.leadPeopleIds = leadPeopleIds;
+	}
+
+	public String getLeadPeopleNames() {
+		return leadPeopleNames;
+	}
+
+	public void setLeadPeopleNames(String leadPeopleNames) {
+		this.leadPeopleNames = leadPeopleNames;
+	}
+
+	public String getLeadDepartmentIds() {
+		return leadDepartmentIds;
+	}
+
+	public void setLeadDepartmentIds(String leadDepartmentIds) {
+		this.leadDepartmentIds = leadDepartmentIds;
+	}
+
+	public String getJoinPersonIds() {
+		return joinPersonIds;
+	}
+
+	public void setJoinPersonIds(String joinPersonIds) {
+		this.joinPersonIds = joinPersonIds;
+	}
+
+	public String getJoinPersonNames() {
+		return joinPersonNames;
+	}
+
+	public void setJoinPersonNames(String joinPersonNames) {
+		this.joinPersonNames = joinPersonNames;
+	}
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/dao/entity/Point.java

@@ -270,7 +270,7 @@ public class Point extends BasicEntity {
 	/**
 	 * 所在建筑名称
 	 */
-	@Column(name="building_name")
+//	@Column(name="building_name")
 	private String buildingName;
 
 	public String getBuildingName() {
@@ -292,7 +292,7 @@ public class Point extends BasicEntity {
 	/**
 	 * 所在建筑Id
 	 */
-	@Column(name="building_id")
+//	@Column(name="building_id")
 	private String buildingId;
 
 	/**

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -118,9 +118,11 @@ public class CommandController extends BaseController {
     @Value("${video.url}")
  	private String videoUrl;
 
-
     @Autowired
     IDutyPersonService iDutyPersonService;
+
+
+
     /**
      * 警情列表
      *
@@ -938,5 +940,17 @@ public class CommandController extends BaseController {
         }
         return ResponseHelper.buildResponse(dto);
     }
-    
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET",value = "app-根据警情id查询力量调派列表",   notes = "app-根据警情id查询力量调派列表")
+    @GetMapping(value = "/app/transferList")
+    public ResponseModel getPowerTransferList(@RequestParam String alertId,
+                                              @RequestParam(defaultValue = "company") String type,
+                                              @RequestParam(value = "current") int current,
+                                              @RequestParam(value = "size") int size) {
+        Page page = new Page();
+        page.setSize(size);
+        page.setCurrent(current);
+        return ResponseHelper.buildResponse(powerTransferService.getPowerTransferPageByParam(Long.valueOf(alertId), type, page));
+    }
 }
\ No newline at end of file

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

@@ -360,14 +360,14 @@ public class OrgUsrController extends BaseController {
     /**
      * 获取用户单位归属
      *
-     * @param id
+     * @param userId
      * @return
      */
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/getUserUnit", method = RequestMethod.GET)
+    @RequestMapping(value = "/{userId}/userUnit", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取用户单位归属", notes = "获取用户单位归属")
-    public ResponseModel<UserUnitDto> getUserUnit(@RequestParam String id, @RequestParam String type, @RequestParam String code) {
-        return ResponseHelper.buildResponse(iOrgUsrService.getUserUnit(id, type, code));
+    public ResponseModel<UserUnitDto> getUserUnit(@PathVariable String userId) {
+        return ResponseHelper.buildResponse(iOrgUsrService.getUserUnit(userId));
     }
 
 }
\ No newline at end of file

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

@@ -227,7 +227,7 @@ public class MaintenanceCompanyServiceImpl
 	@Override
 	public List<Map<String, Object>> getMaintenanceCompanyDropDownList() {
 		LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<MaintenanceCompany>();
-		wrapper.select(MaintenanceCompany::getCode, MaintenanceCompany::getName);
+		wrapper.select(MaintenanceCompany::getCode, MaintenanceCompany::getName, MaintenanceCompany::getSequenceNbr);
 		wrapper.eq(MaintenanceCompany::getType, COMPANY);
 		wrapper.eq(MaintenanceCompany::getIsDelete, false);
 		return maintenanceCompanyMapper.selectMaps(wrapper);

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

@@ -46,6 +46,11 @@ import java.util.stream.Collectors;
 
 @Service
 public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapper> implements IOrgUsrService {
+
+    private static final String TYPE = "PERSON,COMPANY";
+
+    private static final String CODE = "amosAccount";
+
     @Autowired
     DynamicFormInstanceServiceImpl alertFormValueServiceImpl;
     @Autowired
@@ -1003,13 +1008,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
 
     @Override
-    public UserUnitDto getUserUnit(String id, String type, String code) {
-        if (StringUtils.isNotBlank(id) && StringUtils.isNotBlank(type) && StringUtils.isNotBlank(code)) {
-            String[] typeArr = type.split(",");
+    public UserUnitDto getUserUnit(String userId) {
+        if (StringUtils.isNotBlank(userId)) {
+            String[] typeArr = TYPE.split(",");
             //	业主单位
-            List<UserUnitDto> list = orgUsrMapper.getUserUnit(id, typeArr[0], null);
+            List<UserUnitDto> list = orgUsrMapper.getUserUnit(userId, typeArr[0], null);
             //     维保单位
-            List<DynamicFormInstance> instanceList = alertFormValueServiceImpl.getInstanceByCodeAndValue(code, id);
+            List<DynamicFormInstance> instanceList = alertFormValueServiceImpl.getInstanceByCodeAndValue(CODE, userId);
             if (!CollectionUtils.isEmpty(list) && !CollectionUtils.isEmpty(instanceList)) {
                 throw new RuntimeException("人员绑定单位重复！");
             } else {

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

@@ -125,7 +125,6 @@ public class AlertSubmittedController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/reporting/list", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "根据警情id查询警情报送列表", notes = "根据警情id查询警情报送列表")
-
     public ResponseModel<SchedulingReportingDto> listReportingByParam(@RequestBody AlertSubmittedDto queryParam) {
         queryParam.setSubmissionMethodCode(SubmissionMethodEnum.SMS.getCode());
         return ResponseHelper.buildResponse(alertSubmittedService.listReportingByParam(queryParam));

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireTeamServiceImpl.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.Menu;
 import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
@@ -56,6 +58,9 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
     @Autowired
     OrgUsrServiceImpl orgUsrService;
 
+    @Autowired
+    DataDictionaryServiceImpl iDataDictionaryService;
+
     /**
      * 获取监控大队列表
      *
@@ -185,6 +190,11 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
             FireTeam parentTeam = getById(fireTeam.getParent());
             fireTeam.setTreeCode(parentTeam.getTreeCode() + TreeParser.genTreeCode());
         }
+
+        DataDictionary dataDictionary = iDataDictionaryService.getById(fireTeam.getTypeCode());
+        if(null !=dataDictionary ) {
+            fireTeam.setType(dataDictionary.getName());
+        }
         if (ValidationUtil.isEmpty(fireTeam.getSequenceNbr())) {
             save(fireTeam);
         } else {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.yeejoin.amos.boot.module.common.api.dto.FireBrigadeResourceDto;
+import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
-import com.yeejoin.amos.boot.module.jcs.api.dto.*;
+import com.yeejoin.amos.boot.module.jcs.api.dto.CarStatusInfoDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerCarCountDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerCompanyCountDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyResourcesDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferResourceDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferSimpleDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
+import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompany;
+import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
+import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
 import com.yeejoin.amos.boot.module.jcs.api.enums.DutyInfoEnum;
+import com.yeejoin.amos.boot.module.jcs.api.enums.FireBrigadeTypeEnum;
+import com.yeejoin.amos.boot.module.jcs.api.enums.FireCarStatusEnum;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferMapper;
+import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferService;
 import com.yeejoin.amos.component.rule.config.RuleConfig;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -21,25 +38,17 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.typroject.tyboot.component.emq.EmqKeeper;
+import org.typroject.tyboot.core.foundation.exception.BaseException;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.google.common.collect.Lists;
-import com.yeejoin.amos.boot.module.common.api.dto.FireBrigadeResourceDto;
-import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
-import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
-import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompany;
-import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
-import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
-import com.yeejoin.amos.boot.module.jcs.api.enums.FireBrigadeTypeEnum;
-import com.yeejoin.amos.boot.module.jcs.api.enums.FireCarStatusEnum;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferService;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 力量调派 服务实现类
@@ -75,6 +84,9 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
     PowerTransferMapper powerTransferMapper;
 
     @Autowired
+    EquipFeignClient equipFeignClient;
+
+    @Autowired
     private EmqKeeper emqKeeper;
 
     @Value("${mqtt.topic.command.power.deployment}")
@@ -148,7 +160,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
                                 || FireCarStatusEnum.出动.getCode().equals(car.get("carState"))).forEach(car -> {
                     FireBrigadeResourceDto fireCarDto = (FireBrigadeResourceDto) Bean.mapToBean(car,
                             FireBrigadeResourceDto.class);
-                    // TODO 后期根据车物联状态来返回，现在为"在位=执勤","执勤=出动"
+                    // TODO 后期根据车物联状态来返回，现在为"(装备)在位=执勤","(装备)执勤=出动"
                     if (FireCarStatusEnum.执勤.getCode().equals(fireCarDto.getCarState())) {
                         fireCarDto.setCarStateDesc(FireCarStatusEnum.执勤.getName());
                     } else {
@@ -352,4 +364,53 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
         }
         return list;
     }
+
+    @Override
+    public IPage<PowerTransferResourceDto> getPowerTransferPageByParam(Long alertCalledId, String type, Page<PowerTransferResourceDto> page) {
+        if (ValidationUtil.isEmpty(alertCalledId)) {
+            throw new BaseException("警情id为空", "", "警情id为空");
+        }
+        IPage<PowerTransferResourceDto> resultPage = null;
+        switch (type) {
+            case "company":
+                resultPage = powerTransferMapper.getPowerTransferTeamResource(page, alertCalledId);
+                break;
+            case "car":
+                resultPage = getPowerTransferCarResource(page, alertCalledId);
+                break;
+            case "person":
+                // TODO 暂时没有调度人员
+                resultPage = new Page<>();
+                break;
+            default:
+                break;
+        }
+        return resultPage;
+    }
+
+    private IPage<PowerTransferResourceDto> getPowerTransferCarResource(Page<PowerTransferResourceDto> page, Long alertCalledId) {
+        ResponseModel<Object> result = equipFeignClient.getFireCarListAll();
+        Map<String, List<Map<String, Object>>> carInfoMap = Maps.newConcurrentMap();
+        if (!ValidationUtil.isEmpty(result)) {
+            List<Map<String, Object>> fireCarListMapList = (List<Map<String, Object>>) result.getResult();
+            if (!ValidationUtil.isEmpty(fireCarListMapList)) {
+                carInfoMap =
+                        fireCarListMapList.stream().collect(Collectors.groupingBy(car -> car.get("id").toString()));
+            }
+        }
+
+        IPage<PowerTransferResourceDto> carResourcePage = powerTransferMapper.getPowerTransferCarResource(page, alertCalledId);
+        Map<String, List<Map<String, Object>>> finalCarInfoMap = carInfoMap;
+        carResourcePage.getRecords().forEach(car -> {
+            String seq = car.getSequenceNbr().toString();
+            car.setName((String) finalCarInfoMap.get(seq).get(0).get("name"));
+            String carStateCode = (String) finalCarInfoMap.get(seq).get(0).get("carState");
+            FireCarStatusEnum.getEnum(carStateCode);
+            car.setCarState(!ValidationUtil.isEmpty(FireCarStatusEnum.getEnum(carStateCode)) ?
+                    FireCarStatusEnum.getEnum(carStateCode).getName() : "");
+            List<String> images = (List<String>) finalCarInfoMap.get(seq).get(0).get("image");
+            car.setImg(!ValidationUtil.isEmpty(images) ? images.get(0) : "");
+        });
+        return carResourcePage;
+    }
 }

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

@@ -94,6 +94,11 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-mail</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.liquibase</groupId>
+			<artifactId>liquibase-core</artifactId>
+			<version>3.8.9</version>
+		</dependency>
 	</dependencies>
 
 </project>

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/feign/FeignConfiguration.java

 package com.yeejoin.amos.maintenance.business.feign;
 
 import feign.codec.Encoder;
+import feign.codec.ErrorDecoder;
 import feign.form.spring.SpringFormEncoder;
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,4 +23,9 @@ public class FeignConfiguration {
     public FeignBasicAuthRequestInterceptor basicAuthRequestInterceptor() {
         return new FeignBasicAuthRequestInterceptor();
     }
+
+    @Bean
+    public FeignErrorDecoder errorDecoder(){
+        return new FeignErrorDecoder();
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/feign/FeignErrorDecoder.java

+package com.yeejoin.amos.maintenance.business.feign;
+
+import feign.Response;
+import feign.Util;
+import feign.codec.ErrorDecoder;
+
+import java.io.IOException;
+
+/**
+ * @author DELL
+ */
+
+public class FeignErrorDecoder implements ErrorDecoder {
+
+    @Override
+    public Exception decode(String s, Response response) {
+        String msg = null;
+        try {
+            msg = Util.toString(response.body().asReader());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        throw new RuntimeException(msg);
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/feign/JCSFeignClient.java

+package com.yeejoin.amos.maintenance.business.feign;
+
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+/**
+ * @author DELL
+ */
+@FeignClient(name = "${jcs.fegin.name}",configuration = FeignConfiguration.class)
+public interface JCSFeignClient {
+
+    /**
+     * 查询用户单位信息
+     * @param userId 用户id
+     * @return ResponseModel<ReginParams.PersonIdentity>
+     */
+    @GetMapping(value = "jcs/org-usr/{userId}/userUnit")
+    FeignClientResult getUserUnit(@PathVariable String userId);
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/core/framework/PersonIdentifyAspect.java

@@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.maintenance.business.feign.JCSFeignClient;
 import com.yeejoin.amos.maintenance.exception.PermissionException;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
@@ -12,8 +14,12 @@ import org.aspectj.lang.annotation.Before;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+
+import java.util.Map;
 
 /**
  * @author DELL
@@ -26,30 +32,23 @@ public class PersonIdentifyAspect {
 
     @Autowired
     RedisUtils redisUtils;
+    @Autowired
+    JCSFeignClient jcsFeignClient;
+
+    final int HTTP_OK_STATUS = 200;
 
     @Before(value = "@annotation(com.yeejoin.amos.maintenance.core.framework.PersonIdentify) && @annotation(permission)")
     public void personIdentity(JoinPoint joinPoint, PersonIdentify permission) throws PermissionException {
         ReginParams reginParam = JSON.parseObject(redisUtils.get(buildKey(RequestContext.getToken())).toString(), ReginParams.class);
         if (permission.isNeedIdentity() && reginParam != null) {
             //调用jcs，进行人员身份判断，是维保公司人员还是业主单位人员
-//            JSONObject result = new JSONObject();
-//            String identityType = result.get("identityType").toString();
-//            String personSeq = result.get("personSeq").toString();
-//            String personName = result.get("personName").toString();
-//            String companyId = result.get("companyId").toString();
-//            String companyName = result.get("companyName").toString();
-            String identityType = "1";
-            String personSeq = "1421016571081420802";
-            String personName = "SHG";
-            String companyId = "1420727427956502529";
-            String companyName ="机电公司";
-            ReginParams.PersonIdentity personIdentity  = new ReginParams.PersonIdentity();
-            personIdentity.setIdentityType(identityType);
-            personIdentity.setPersonSeq(personSeq);
-            personIdentity.setPersonName(personName);
-            personIdentity.setCompanyId(companyId);
-            personIdentity.setCompanyName(companyName);
-            reginParam.setPersonIdentity(new ReginParams.PersonIdentity());
+            String userId = reginParam.getUserModel().getUserId();
+            FeignClientResult responseModel = jcsFeignClient.getUserUnit(userId);
+            if (ObjectUtils.isEmpty(responseModel.getResult()) || responseModel.getStatus() != HTTP_OK_STATUS) {
+                throw new RuntimeException(responseModel.getDevMessage());
+            }
+            ReginParams.PersonIdentity personIdentity = (ReginParams.PersonIdentity) Bean.mapToBean((Map<String, Object>) responseModel.getResult(),ReginParams.PersonIdentity.class);
+            reginParam.setPersonIdentity(personIdentity);
             redisUtils.set(buildKey(RequestContext.getToken()), JSONObject.toJSONString(reginParam));
         }
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/InputItemController.java

@@ -2,10 +2,7 @@ package com.yeejoin.amos.supervision.business.controller;
 
 import java.io.InputStream;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -96,6 +93,7 @@ public class InputItemController extends AbstractBaseController {
             BeanUtils.copyProperties(param, inputItem);
             inputItem.setOrgCode(loginOrgCode);
             inputItem.setCreateBy(user.getUserId());
+            inputItem.setItemStart(0);
             inputItemService.addNewInputItem(inputItem);
             return CommonResponseUtil.success();
         } catch (Exception e) {
@@ -416,4 +414,12 @@ public class InputItemController extends AbstractBaseController {
     public CommonResponse getItemParent(@ApiParam(value = "检查项id") @RequestParam(required = false) String id) {
         return CommonResponseUtil.success(inputItemService.getItemParent(id));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "新*修改检查项状态", notes = "新*修改检查项状态")
+    @PostMapping(value = "/status", produces = "application/json;charset=UTF-8")
+    public CommonResponse changePointStatus(@ApiParam(value = "状态") @RequestBody HashMap<String, Object> params) {
+        inputItemService.updatePointById(params);
+        return CommonResponseUtil.success();
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/PlanController.java

@@ -3,15 +3,13 @@ package com.yeejoin.amos.supervision.business.controller;
 import java.util.HashMap;
 import java.util.List;
 
+import com.yeejoin.amos.supervision.core.common.request.AddPlanRequest;
+import com.yeejoin.amos.supervision.core.common.response.PlanPointRespone;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
@@ -86,7 +84,7 @@ public class PlanController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "巡检计划新增及编辑", notes = "巡检计划新增及编辑")
     @RequestMapping(value = "/addPlan", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
-    public CommonResponse checkPlanAdd(@ApiParam(value = "巡检计划", required = true) @RequestBody Plan param) {
+    public CommonResponse checkPlanAdd(@ApiParam(value = "巡检计划", required = true) @RequestBody AddPlanRequest param) {
         try {
             String userId = getUserId();
             ReginParams reginParams = getSelectedOrgInfo();
@@ -188,4 +186,33 @@ public class PlanController extends AbstractBaseController {
         return CommonResponseUtil.success(list);
     }
 
+    /**
+     * 计划启用停用
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "计划启用停用", notes = "计划启用停用")
+    @RequestMapping(value = "/setPlanStatus", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+    public CommonResponse setPlanStatus(
+            @ApiParam(value = "计划id") @RequestParam(value = "planId", required = false) Long planId,
+            @ApiParam(value = "计划状态") @RequestParam(value = "status", required = false) byte status ) {
+        planService.setplanstatus(planId, status);
+        return CommonResponseUtil.success();
+    }
+
+    /**
+     * 获取计划详情
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "计划启用停用", notes = "计划启用停用")
+    @RequestMapping(value = "/getPlanDetails", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+    public CommonResponse getPlanDetails(
+            @ApiParam(value = "计划id") @RequestParam(value = "planId", required = false) Long planId ) {
+        PlanPointRespone planRequest = planService.getplandetails(planId);
+        return CommonResponseUtil.success(planRequest);
+    }
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/PointController.java

@@ -17,6 +17,7 @@ import com.yeejoin.amos.supervision.business.vo.PointClassifyVo;
 import com.yeejoin.amos.supervision.business.vo.PointInputItemVo;
 import com.yeejoin.amos.supervision.business.vo.PointVo;
 import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
+import io.swagger.annotations.ApiModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/mapper/InputItemMapper.java

@@ -34,4 +34,6 @@ public interface InputItemMapper {
     Integer insertList(List<InputItem> list);
 
     List<InputItemVo> getInputItemParent(@Param("id") String id);
+
+    void updatePointById(Map<String, Object> param);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/mapper/PointMapper.java

@@ -11,6 +11,7 @@ import com.yeejoin.amos.supervision.business.param.PointImportQueryParam;
 import com.yeejoin.amos.supervision.business.vo.LeavelMovePointVo;
 import com.yeejoin.amos.supervision.business.vo.PointInputItemVo;
 import com.yeejoin.amos.supervision.business.vo.PointVo;
+import com.yeejoin.amos.supervision.dao.entity.PointInputItem;
 import org.apache.ibatis.annotations.Param;
 
 import com.yeejoin.amos.supervision.core.common.response.PointResponse;
@@ -140,4 +141,19 @@ public interface PointMapper extends BaseMapper {
 	 * @param list 点ID列表
 	 */
 	List<Map<String, Object>> getPointRefItem(List<Long> list);
+
+	/**
+	 * 根据业主单位查询点
+	 */
+	List<Long> getPointRouteList(List<Long> list);
+
+	/**
+	 * 根据业主单位查询点
+	 */
+	List<PointInputItem> getPointRouteItem(List<Long> list);
+
+	/**
+	 * 根据路线id查询所有点
+	 */
+	List<Long> getPointoriginalidbyrouteid(@Param(value = "routeId") Long routeId);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/param/InputItemPageParam.java

@@ -18,6 +18,16 @@ public class InputItemPageParam extends CommonPageable{
 
 	private String inputClassify;
 
+	public String getItemClassify() {
+		return itemClassify;
+	}
+
+	public void setItemClassify(String itemClassify) {
+		this.itemClassify = itemClassify;
+	}
+
+	private String itemClassify;
+
 	public String getInputClassify() {
 		return inputClassify;
 	}

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/param/PlanInfoPageParam.java

@@ -47,6 +47,21 @@ public class PlanInfoPageParam extends CommonPageable {
 	 */
 	private String ownerId;
 
+	/**
+	 * 业主单位id
+	 */
+	private String planStatus;
+
+	/**
+	 * 业主单位id
+	 */
+	private String checkTypeId;
+
+	/**
+	 * 业主单位id
+	 */
+	private String leadPerson;
+
 	public String getOwnerId() {
 		return ownerId;
 	}
@@ -102,5 +117,28 @@ public class PlanInfoPageParam extends CommonPageable {
 	public void setUserId(String userId) {
 		this.userId = userId;
 	}
-	
+
+	public String getPlanStatus() {
+		return planStatus;
+	}
+
+	public void setPlanStatus(String planStatus) {
+		this.planStatus = planStatus;
+	}
+
+	public String getCheckTypeId() {
+		return checkTypeId;
+	}
+
+	public void setCheckTypeId(String checkTypeId) {
+		this.checkTypeId = checkTypeId;
+	}
+
+	public String getLeadPerson() {
+		return leadPerson;
+	}
+
+	public void setLeadPerson(String leadPerson) {
+		this.leadPerson = leadPerson;
+	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/InputItemServiceImpl.java

@@ -272,4 +272,9 @@ public class InputItemServiceImpl implements IInputItemService {
         return inputItemMapper.insertList(list);
     }
 
+    @Override
+    public void updatePointById(Map<String, Object> param) {
+        inputItemMapper.updatePointById(param);
+    }
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanServiceImpl.java

 package com.yeejoin.amos.supervision.business.service.impl;
 
 import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.supervision.business.constants.XJConstant;
 import com.yeejoin.amos.supervision.business.dao.mapper.PlanMapper;
-import com.yeejoin.amos.supervision.business.dao.repository.IPlanDao;
-import com.yeejoin.amos.supervision.business.dao.repository.IPlanTaskDao;
-import com.yeejoin.amos.supervision.business.dao.repository.IPlanTaskDetailDao;
-import com.yeejoin.amos.supervision.business.dao.repository.IRouteDao;
+import com.yeejoin.amos.supervision.business.dao.mapper.PointMapper;
+import com.yeejoin.amos.supervision.business.dao.mapper.RouteMapper;
+import com.yeejoin.amos.supervision.business.dao.repository.*;
 import com.yeejoin.amos.supervision.business.param.PlanInfoPageParam;
 import com.yeejoin.amos.supervision.business.service.intfc.IPlanService;
+import com.yeejoin.amos.supervision.core.common.request.AddPlanRequest;
+import com.yeejoin.amos.supervision.core.common.response.PlanPointRespone;
 import com.yeejoin.amos.supervision.core.util.DateUtil;
-import com.yeejoin.amos.supervision.dao.entity.Plan;
-import com.yeejoin.amos.supervision.dao.entity.Route;
+import com.yeejoin.amos.supervision.dao.entity.*;
 import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
+import org.apache.velocity.util.ArrayListWrapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +23,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -44,6 +47,24 @@ public class PlanServiceImpl implements IPlanService {
     @Autowired
     IRouteDao iRouteDao;
 
+    @Autowired
+    IPointDao iPointDao;
+
+    @Autowired
+    private PointMapper pointMapper;
+
+    @Autowired
+    private IRoutePointDao iRoutePointDao;
+
+    @Autowired
+    private IRoutePointItemDao iRoutePointItemDao;
+
+    @Autowired
+    private IPointInputItemDao iPointInputItemDao;
+
+    @Autowired
+    private IPlanService planService;
+
     private static final Logger logger = LoggerFactory.getLogger(PlanServiceImpl.class);
 
     @Override
@@ -80,27 +101,86 @@ public class PlanServiceImpl implements IPlanService {
     }
 
     @Override
+    @Transactional
     public void addPlan(HashMap<String, Object> map) {
-        Plan param = (Plan) map.get("param");
+        // 新增路线
+        AddPlanRequest addPlanRequest = (AddPlanRequest) map.get("param");
+        Plan param = addPlanRequest.getPlan();
         String orgCode = map.get("org_code") == null ? "" : map.get("org_code").toString();
         String userId = map.get("user_id") == null ? "" : map.get("user_id").toString();
         param.setOrgCode(orgCode);
-        param.setStatus(Byte.parseByte(XJConstant.PLAN_STATUS_START));
+        param.setStatus(Byte.parseByte(XJConstant.PLAN_STATUS_STOP));
         param.setNextGenDate(DateUtil.getIntervalDate(new Date(), 0));
         param.setCreateBy(userId);
-        //编辑计划
-        if (param.getId() > 0) {
-            Plan oriPlan = planDao.findById(param.getId()).get();
-            param.setCreateDate(oriPlan.getCreateDate());
-            param.setCreateBy(oriPlan.getCreateBy());
-            param.setLastUpdBy(userId);
-            param.setFirstFlag(XJConstant.PLAN_FIRST_STATUS_YES);
+        addPlanRequest.setPlan(param);
+        Route route = save(addPlanRequest);
+        if (!ObjectUtils.isEmpty(route)) {
+            param.setRouteId(route.getId());
+            //编辑计划
+            if (param.getId() > 0) {
+                Plan oriPlan = planDao.findById(param.getId()).get();
+                param.setCreateDate(oriPlan.getCreateDate());
+                param.setCreateBy(oriPlan.getCreateBy());
+                param.setLastUpdBy(userId);
+                param.setFirstFlag(XJConstant.PLAN_FIRST_STATUS_YES);
+            }
+            if (XJConstant.FIX_DATE_NO.equals(param.getIsFixedDate()) && (XJConstant.PLAN_TYPE_MONTH.equals(param.getPlanType()) || XJConstant.PLAN_TYPE_YEAR.equals(param.getPlanType()))) {
+                param.setDayBegin(DateUtil.formatStrToTime("00:00:00"));
+                param.setDayEnd(DateUtil.formatStrToTime("23:59:59"));
+            }
+            planDao.save(param);
         }
-        if (XJConstant.FIX_DATE_NO.equals(param.getIsFixedDate()) && (XJConstant.PLAN_TYPE_MONTH.equals(param.getPlanType()) || XJConstant.PLAN_TYPE_YEAR.equals(param.getPlanType()))) {
-            param.setDayBegin(DateUtil.formatStrToTime("00:00:00"));
-            param.setDayEnd(DateUtil.formatStrToTime("23:59:59"));
+    }
+
+    /**
+     *  默认新增路线
+     */
+    public Route save (AddPlanRequest addPlanRequest) {
+        Route saveRoute = new Route();
+        Plan plan = addPlanRequest.getPlan();
+
+        // 判断是新增还是修改
+        if (plan.getId()>0) {
+            // 删除相关点项内容
+            iRoutePointDao.delRoutePointByRouteId(plan.getRouteId());
+            iRoutePointItemDao.delRoutePointItem(plan.getRouteId());
+            saveRoute.setId(plan.getRouteId());
         }
-        planDao.save(param);
+
+        saveRoute.setName(plan.getName());
+        saveRoute.setOrgCode(plan.getOrgCode());
+        saveRoute.setCreatorId(plan.getCreateBy());
+        Route route = iRouteDao.save(saveRoute);
+
+        if (!ObjectUtils.isEmpty(route.getId())) {
+            // 新增路线与点关系
+            List<Long> ownerIds = addPlanRequest.getOwnerId();
+            if (!ObjectUtils.isEmpty(ownerIds)) {
+                List<Long> pointVos = pointMapper.getPointRouteList(ownerIds);
+                if (!ObjectUtils.isEmpty(pointVos)) {
+                    if (!ObjectUtils.isEmpty(pointVos)) {
+                        pointVos.forEach(point -> {
+                            RoutePoint routePoint = new RoutePoint();
+                            routePoint.setOrgCode(plan.getOrgCode());
+                            routePoint.setCreatorId(plan.getCreateBy());
+                            routePoint.setRouteId(route.getId());
+                            routePoint.setPointId(point);
+                            iRoutePointDao.save(routePoint);
+                        });
+                        List<PointInputItem> pointInputItems = pointMapper.getPointRouteItem(pointVos);
+                        if (!ObjectUtils.isEmpty(pointInputItems)) {
+                            pointInputItems.forEach(pointInputItem -> {
+                                RoutePointItem routePointItem = new RoutePointItem();
+                                routePointItem.setRoutePointId(route.getId());
+                                routePointItem.setPointInputItemId(pointInputItem.getId());
+                                iRoutePointItemDao.save(routePointItem);
+                            });
+                        }
+                    }
+                }
+            }
+        }
+        return route;
     }
 
     @Override
@@ -176,5 +256,22 @@ public class PlanServiceImpl implements IPlanService {
         return planMapper.queryPlanListByOrgCode(loginOrgCode);
     }
 
+    @Override
+    public void setplanstatus (Long id, byte status) {
+        Plan oriPlan = planDao.findById(id).get();
+        oriPlan.setStatus(status);
+        planDao.save(oriPlan);
+    }
 
+    @Override
+    public PlanPointRespone  getplandetails (Long id) {
+        PlanPointRespone planRequest = new PlanPointRespone();
+        Plan plan =  planService.queryPlanById(id);;
+        if (!ObjectUtils.isEmpty(plan)) {
+            List<Long> ids = pointMapper.getPointoriginalidbyrouteid(plan.getRouteId());
+            planRequest.setPlan(plan);
+            planRequest.setOwnerId(ids);
+        }
+        return planRequest;
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PointServiceImpl.java

@@ -1204,4 +1204,5 @@ public class PointServiceImpl implements IPointService {
         iPointInputItemDao.deleteByPointId(idLists);
         iPointDao.delPointByPointNo(id);
     }
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/intfc/IInputItemService.java

@@ -116,4 +116,6 @@ public interface IInputItemService {
     List generateDictionaryValue();
 
     List getItemParent(String id);
+
+    void updatePointById(Map<String, Object> param);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/intfc/IPlanService.java

@@ -3,6 +3,9 @@ package com.yeejoin.amos.supervision.business.service.intfc;
 import java.util.HashMap;
 import java.util.List;
 
+import com.yeejoin.amos.supervision.core.common.request.AddPlanRequest;
+import com.yeejoin.amos.supervision.core.common.response.PlanPointRespone;
+import com.yeejoin.amos.supervision.dao.entity.Point;
 import org.springframework.data.domain.Page;
 
 import com.yeejoin.amos.supervision.business.param.PlanInfoPageParam;
@@ -70,5 +73,13 @@ public interface IPlanService {
 	 */
 	List<HashMap<String, Object>> queryPlanListByOrgCode(String loginOrgCode);
 
-	
+	/**
+	 * 计划启用停用
+	 */
+	void setplanstatus(Long id, byte status);
+
+	/**
+	 * 获取计划详情
+	 */
+	PlanPointRespone getplandetails(Long id);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/util/InputItemParamUtil.java

@@ -55,6 +55,8 @@ public class InputItemParamUtil {
                     param.setItemNo(toString(queryRequests.get(i).getValue()));
                 } else if ("inputClassify".equals(name)) {
                     param.setInputClassify(toString(queryRequests.get(i).getValue()));
+                } else if ("itemClassify".equals(name)) {
+                    param.setItemClassify(toString(queryRequests.get(i).getValue()));
                 }
             }
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/util/PlanPageParamUtil.java

@@ -24,6 +24,12 @@ public class PlanPageParamUtil {
 				param.setRemark(toString(queryRequests.get(i).getValue()));
 			}else if("ownerId".equals(name)){
 				param.setOwnerId(toString(queryRequests.get(i).getValue()));
+			}else if("planStatus".equals(name)){
+				param.setPlanStatus(toString(queryRequests.get(i).getValue()));
+			}else if("leadPerson".equals(name)){
+				param.setLeadPerson(toString(queryRequests.get(i).getValue()));
+			}else if("checkTypeId".equals(name)){
+				param.setCheckTypeId(toString(queryRequests.get(i).getValue()));
 			}
 		}		
 		param.setOrgCode(perMap.get("orgCode") == null ? null:perMap.get("orgCode").toString());

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.tzs.biz.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
 import com.baomidou.mybatisplus.core.toolkit.SystemClock;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -10,18 +11,24 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.excel.ExcelUtil;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.MaintenanceCompanyServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlarmStatisticsDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCallInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledObjsDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledQueryDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.DutyPersonDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ESAlertCalledDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ESAlertCalledRequestDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.MaintenanceUnitDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.AlertCalled;
+import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
+import com.yeejoin.amos.boot.module.tzs.api.entity.MaintenanceUnit;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.AlertCalledServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.AlertFormValueServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.DispatchPaperServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.ESAlertCalledService;
+import com.yeejoin.amos.boot.module.tzs.biz.service.impl.ElevatorServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.AlertBeanDtoVoUtils;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -34,6 +41,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
@@ -45,6 +53,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -63,14 +72,25 @@ public class AlertCalledController extends BaseController {
 
 	@Autowired
 	RedisUtils redisUtils;
+
 	@Autowired
 	AlertCalledServiceImpl iAlertCalledService;
+
 	@Autowired
-	private ESAlertCalledService eSAlertCalledService;
+	ESAlertCalledService eSAlertCalledService;
+
 	@Autowired
 	DispatchPaperServiceImpl dispatchPaperServiceImpl;
+
 	@Autowired
 	AlertFormValueServiceImpl iAlertFormValueService;
+
+	@Autowired
+	ElevatorServiceImpl elevatorServiceImpl;
+
+	@Autowired
+	MaintenanceCompanyServiceImpl maintenanceCompanyService;
+
     /**
      * 新增警情接警填报记录
      *
@@ -89,7 +109,6 @@ public class AlertCalledController extends BaseController {
 		return ResponseHelper.buildResponse(alertCalledObjsDto.getAlertCalledDto());
 	}
 
-
 	/**
 	 *
 	 * <pre>
@@ -114,8 +133,6 @@ public class AlertCalledController extends BaseController {
 		return ResponseHelper.buildResponse(esAlertCalledDtoPage);
 	}
 
-
-
     /**
      * 根据id查询
      *
@@ -147,7 +164,6 @@ public class AlertCalledController extends BaseController {
 		return ResponseHelper.buildResponse(alertCallInfoDto);
 	}
 
-
 	/**
 	 * 获取下一个 工单编号
 	 *
@@ -271,9 +287,6 @@ public class AlertCalledController extends BaseController {
 		return queryWrapper;
 	}
 
-
-
-
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(value = "查询警情事件记录", notes = "查询警情事件记录")
 	@PostMapping("/selectRecord")
@@ -296,7 +309,6 @@ public class AlertCalledController extends BaseController {
 				AlertCalledQueryDto.class, null, false);
 	}
 
-
 	/**
 	 * 冻结工单-维修
 	 * @return

amos-boot-system-jcs/pom.xml

@@ -22,6 +22,10 @@
 			<artifactId>amos-boot-module-command-biz</artifactId>
 			<version>${amos-biz-boot.version}</version>
 		</dependency>
+      <dependency>
+          <groupId>org.liquibase</groupId>
+          <artifactId>liquibase-core</artifactId>
+      </dependency>
   </dependencies>
 
     <build>

amos-boot-system-maintenance/pom.xml

@@ -13,6 +13,10 @@
 		<artifactId>amos-boot-module-maintenance-biz</artifactId>
 		<version>${amos-biz-boot.version}</version>
 	</dependency>
+     <dependency>
+         <artifactId>mysql-connector-java</artifactId>
+         <groupId>mysql</groupId>
+     </dependency>
   </dependencies>
  <build>
         <plugins>

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

@@ -12,7 +12,7 @@ logging.config=classpath:logback-${spring.profiles.active}.xml
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone = Asia/Shanghai
 #DB properties:
-spring.datasource.driver-class-name = com.mysql.jdbc.Driver
+spring.datasource.driver-class-name = com.mysql.cj.jdbc.Driver
 spring.datasource.hikari.maxLifetime = 1765000
 spring.datasource.hikari.maximum-pool-size = 10
 spring.datasource.testWhileIdle = true
@@ -26,7 +26,7 @@ mybatis.mapper-locations = classpath:db/mapper/*.xml
 mybatis-plus.mapper-locations=classpath:db/mapper/*.xml
 mybatis.type-aliases-package = com.yeejoin.amos.maintenance.business.entity.mybatis
 mybatis.configuration.mapUnderscoreToCamelCase=true
-spring.liquibase.change-log=classpath:/db/changelog/changelog-master.xml
+spring.liquibase.changeLog=classpath:db/changelog/changelog-master.xml
 spring.liquibase.enabled=true
 
 mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
@@ -35,7 +35,7 @@ equip.feign.name=AMOS-EQUIPMANAGE
 equip.feign.prefix=/equip
 input.custom.prefix = QYZD
 input.statute.prefix = FG
-
+jcs.fegin.name=JCS
 
 Security.fegin.name=AMOS-API-PRIVILEGE
 

amos-boot-system-maintenance/src/main/resources/db/changelog/changelog-master.xml

@@ -6,4 +6,5 @@
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog 
         http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
     <include file="mt-1.0.0.xml" relativeToChangelogFile="true"/>
+    <include file="mt-sql-task.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>
\ No newline at end of file

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

@@ -6,8 +6,8 @@
 		xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
         http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
 	<changeSet author="suhuiguang" id="1628836692856-1" runOnChange="true">
-		<createProcedure procedureName="updatePlanTask" >
-			DROP PROCEDURE IF EXISTS `updatePlanTask`;
+		<sql endDelimiter="#">
+			DROP PROCEDURE IF EXISTS `updatePlanTask`#
 			CREATE PROCEDURE `updatePlanTask`(IN `planTaskId` int,IN `pointId` int,IN `planTaskDetailId` int,IN `executorId` bigint)
 			BEGIN
 			declare num int ;
@@ -22,8 +22,8 @@
 			ELSE
 			update p_plan_task set finish_num = (num + 1), finish_status = 2 where id = planTaskId;
 			end if;
-			END
-		</createProcedure>
+			END#
+		</sql>
 	</changeSet>
 	<changeSet author="suhuiguang" id="1629352951339-1" runOnChange="true">
 		<sql>

amos-boot-system-supervision/src/main/java/com/yeejoin/amos/SupervisionApplication.java

@@ -96,7 +96,13 @@ public class SupervisionApplication {
      * @throws MqttException
      */
     @Bean
-    void initMqtt() throws MqttException
-    { emqKeeper.getMqttClient().subscribe(airportTopic, 1, amosMqttListener); }
+    void initMqtt() {
+        try {
+            emqKeeper.getMqttClient().subscribe(airportTopic, 1, amosMqttListener);
+        } catch (MqttException e) {
+            e.printStackTrace();
+            logger.error("EMQ初始化连接失败!");
+        }
+    }
 
 }
\ No newline at end of file

amos-boot-system-supervision/src/main/resources/db/changelog/mt-1.0.0.xml

@@ -73,7 +73,7 @@
         </preConditions>
         <comment>p_input_item ADD COLUMN item_level</comment>
         <sql>
-            ALTER TABLE p_input_item ADD COLUMN `item_level` varchar(50) DEFAULT NULL COMMENT '检查项等级' AFTER `item_type_classify`;
+            ALTER TABLE p_input_item ADD COLUMN `item_level` varchar(50) DEFAULT NULL COMMENT '检查项等级' AFTER `item_type_classify`;修改列
         </sql>
     </changeSet>
 
@@ -88,4 +88,74 @@
             ALTER TABLE p_input_item ADD COLUMN `item_start` bit(1) DEFAULT b'0' COMMENT '检查项状态' AFTER `item_level`;
         </sql>
     </changeSet>
+
+    <changeSet author="keyong" id="1629688658-1">
+        <preConditions onFail="MARK_RAN">
+            <columnExists tableName="p_plan_task_detail" columnName="executor_id"/>
+        </preConditions>
+        <comment>p_plan_task_detail modify column executor_id</comment>
+        <sql>
+            alter table `p_plan_task_detail` modify column `executor_id` text COMMENT '执行人id' after `status`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629688658-2">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_plan_task_detail" columnName="executor_name"/>
+            </not>
+        </preConditions>
+        <comment>p_plan_task_detail ADD COLUMN executor_name</comment>
+        <sql>
+            ALTER TABLE `p_plan_task_detail` ADD COLUMN `executor_name` text DEFAULT null COMMENT '执行人名称' AFTER `executor_id`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629688658-3">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_plan_task_detail" columnName="item_num"/>
+            </not>
+        </preConditions>
+        <comment>p_plan_task_detail ADD COLUMN item_num</comment>
+        <sql>
+            ALTER TABLE `p_plan_task_detail` ADD COLUMN `item_num` int(11) DEFAULT 0 COMMENT '检查项个数' AFTER `executor_name`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629688658-4">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_plan_task_detail" columnName="executed_num"/>
+            </not>
+        </preConditions>
+        <comment>p_plan_task_detail ADD COLUMN executed_num</comment>
+        <sql>
+            ALTER TABLE `p_plan_task_detail` ADD COLUMN `executed_num` int(11) DEFAULT 0 COMMENT '已执行个数' AFTER `item_num`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629688658-5">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_plan_task_detail" columnName="safety_danger_num"/>
+            </not>
+        </preConditions>
+        <comment>p_plan_task_detail ADD COLUMN safety_danger_num</comment>
+        <sql>
+            ALTER TABLE `p_plan_task_detail` ADD COLUMN `safety_danger_num` int(11) DEFAULT 0 COMMENT '安全隐患个数' AFTER `executed_num`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629688658-6">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_plan_task_detail" columnName="major_danger_num"/>
+            </not>
+        </preConditions>
+        <comment>p_plan_task_detail ADD COLUMN major_danger_num</comment>
+        <sql>
+            ALTER TABLE `p_plan_task_detail` ADD COLUMN `major_danger_num` int(11) DEFAULT 0 COMMENT '重大隐患个数' AFTER `safety_danger_num`;
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_input_item.xml

@@ -26,6 +26,11 @@
 			 <if test="testRequirement != null ">test_requirement=#{testRequirement},</if>
 			 <if test="inputClassify != null ">input_classify=#{inputClassify},</if>
 			 <if test="unit != null ">unit=#{unit},</if>
+			 <if test="checkType != null ">check_type=#{checkType},</if>
+			 <if test="itemParent != null ">item_parent=#{itemParent},</if>
+			 <if test="itemClassify != null ">item_classify=#{itemClassify},</if>
+			 <if test="itemTypeClassify != null ">item_type_classify=#{itemTypeClassify},</if>
+			 <if test="itemLevel != null ">item_level=#{itemLevel},</if>
  		</trim>
  		WHERE id=#{id}
 	</update>
@@ -115,7 +120,7 @@
 		<if test="itemNo!=null"> and a.item_no like concat(concat("%",#{itemNo}),"%")</if>
 		<if test="itemType!=null"> and a.item_Type = #{itemType} </if>
 		<if test="orgCode!=null"> and a.org_Code = #{orgCode}</if>
-		<if test="inputClassify != null"> and a.input_classify = #{inputClassify}</if>
+		<if test="itemClassify != null"> and a.item_classify = #{itemClassify}</if>
 		order by a.id desc
 		<choose>
 	     <when test="pageSize==-1"></when>
@@ -287,4 +292,8 @@
 		AND pii.is_delete != 1
 		ORDER BY create_date DESC;
 	</select>
+
+	<update id="updatePointById" parameterType="map">
+		update p_input_item SET item_start = #{itemStart} WHERE id = #{id}
+	</update>
 </mapper>
\ No newline at end of file

amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_plan.xml

@@ -147,6 +147,15 @@
 		b.owner_name AS ownerName,
 	    b.boss_name as bossName,
 	    a.user_name as userName,
+	    a.check_type_id as checkTypeId,
+		a.check_type_name as checkTypeName,
+		a.lead_department_ids as leadDepartmentIds,
+		a.lead_department_names as leadDepartmentNames,
+		a.lead_people_ids as leadPersonIds,
+		a.lead_people_names as leadPersonNames,
+		a.join_person_ids as joinPersonIds,
+		a.join_person_names as joinPersonNames,
+		(select count(1) from p_route_point ppo where ppo.route_id = b.id) as totalPoint,
 		(select count(1) from p_plan_task t where t.plan_id = a.id) as totalPlanTask,
 		(select count(1) from p_plan_task t where t.plan_id = a.id and t.finish_status <![CDATA[<=]]> 1 ) as waitFinishPlanTask
 		FROM
@@ -155,7 +164,8 @@
 		WHERE
 		a.route_Id = b.id and a.is_delete = 0
 		<if test="planName!=null"> and a.name like concat(concat("%",#{planName}),"%")</if>
-		<if test="planType!=null"> and a.plan_Type = #{planType}</if>
+		<if test="checkTypeId!=null and checkTypeId != '' "> and a.check_type_id = #{checkTypeId}</if>
+		<if test="leadPerson!=null and leadPerson != '' "> and a.lead_people_ids = #{leadPerson}</if>
 		<if test="routeId!=null"> and a.route_Id = #{routeId}</if>
 		<if test="remark!=null"> and a.remark1 like concat(concat("%",#{remark}),"%")</if>
 		<if test="userId!=null"> and FIND_IN_SET(#{userId},a.user_id)</if>

amos-boot-system-supervision/src/main/resources/db/mapper/pointMapper.xml

@@ -1100,4 +1100,43 @@
 					#{pointId}
 		 		</foreach>
 	</select>
+
+	<select id="getPointRouteList" parameterType="list" resultType="Long">
+		SELECT
+			ppi.id
+		FROM
+			p_point ppi
+		WHERE
+			ppi.original_id IN
+		<foreach collection="list" open="(" close=")" separator="," item="routeId">
+			#{routeId}
+		</foreach>
+	</select>
+
+
+	<select id="getPointRouteItem" parameterType="list" resultType="com.yeejoin.amos.supervision.dao.entity.PointInputItem">
+		SELECT
+		ppi.id
+		, ppi.input_item_id itemId
+		, ppi.point_id pointId
+		, ppi.classify_ids classifyId
+		FROM
+		p_point_inputitem ppi
+		WHERE
+		ppi.point_id IN
+		<foreach collection="list" open="(" close=")" separator="," item="pointId">
+			#{pointId}
+		</foreach>
+	</select>
+
+	<select id="getPointoriginalidbyrouteid"  parameterType="long" resultType="Long">
+		SELECT
+			original_id
+		FROM
+			p_point as ppo
+		LEFT JOIN p_route_point as prp ON
+			ppo.id = prp.point_id
+		WHERE
+		 	prp.route_id = #{routeId}
+	</select>
 </mapper>
\ No newline at end of file

pom.xml

@@ -231,9 +231,18 @@
 					<groupId>com.baomidou</groupId>
 					<artifactId>mybatis-plus-boot-starter</artifactId>
 				</exclusion>
+				<exclusion>
+					<artifactId>mysql-connector-java</artifactId>
+					<groupId>mysql</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
+			<artifactId>mysql-connector-java</artifactId>
+			<groupId>mysql</groupId>
+			<version>8.0.22</version>
+		</dependency>
+		<dependency>
 			<groupId>org.typroject</groupId>
 			<artifactId>tyboot-core-auth</artifactId>
 			<version>${tyboot-version}</version>
@@ -299,16 +308,16 @@
 			<name>maven-public</name>
 			<url>http://172.16.1.6:8081/nexus/content/repositories/maven-public/</url>
 		</repository>
-		<repository>
-			<id>maven-public1</id>
-			<name>maven-public</name>
-			<url>http://repo.typroject.org:8081/repository/maven-public/</url>
-		</repository>
-		<repository>
-			<id>maven-snapshot</id>
-			<name>maven-snapshot</name>
-			<url>http://repo.typroject.org:8081/repository/maven-snapshots/</url>
-		</repository>
+<!--		<repository>-->
+<!--			<id>maven-public1</id>-->
+<!--			<name>maven-public</name>-->
+<!--			<url>http://repo.typroject.org:8081/repository/maven-public/</url>-->
+<!--		</repository>-->
+<!--		<repository>-->
+<!--			<id>maven-snapshot</id>-->
+<!--			<name>maven-snapshot</name>-->
+<!--			<url>http://repo.typroject.org:8081/repository/maven-snapshots/</url>-->
+<!--		</repository>-->
 	</repositories>
 
 	<modules>