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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/enums/HomePageEnum.java

@@ -12,13 +12,13 @@ import lombok.AllArgsConstructor;
 public enum HomePageEnum {
 
     DISPATCHALARM("dispatchAlarm", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.DispatchMapServiceImpl"),
-    DISPATCHTASK("dispatchTask", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.DispatchMapServiceImpl"),
-    FIREALARM("fireAlarm", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.DispatchMapServiceImpl"),
-    FAULT("fault", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.DispatchMapServiceImpl"),
-    SHIELD("shield", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.DispatchMapServiceImpl"),
-    WARNING("warning", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.DispatchMapServiceImpl"),
-    NO("no", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.DispatchMapServiceImpl"),
-    YES("yes", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.DispatchMapServiceImpl");
+    DISPATCHTASK("dispatchTask", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.DispatchTaskServiceImpl"),
+    FIREALARM("fireAlarm", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.FireAlarmServiceImpl"),
+    FAULT("fault", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.FaultServiceImpl"),
+    SHIELD("shield", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.ShieldServiceImpl"),
+    WARNING("warning", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.WarningServiceImpl"),
+    NO("no", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.NoServiceImpl"),
+    YES("yes", "com.yeejoin.amos.boot.module.jcs.biz.service.impl.YesServiceImpl");
 
 
 

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

@@ -28,6 +28,7 @@ public class FireTeamDto extends BaseDto {
 
     @ExcelProperty(value = "所属单位", index = 0)
     @ApiModelProperty(value = "机构名称")
+    @ExplicitConstraint(indexNum = 0, sourceClass = RoleNameExplicitConstraint.class,method="getCompanyDetailTree") //动态下拉内容
     private String companyName;
 
     @ExcelIgnore

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

@@ -52,6 +52,7 @@ public class KeySiteExcleDto implements Serializable {
 	@ApiModelProperty(value = "建筑面积(㎡)")
 	private String buildingArea;
 	
+	@ExcelIgnore
 	@ExcelProperty(value = "建筑高度(m)", index = 5)
 	@ApiModelProperty(value = "建筑高度(m)")
 	private String buildingHeight;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/excel/TemplateCellWriteHandlerDate.java

@@ -11,6 +11,8 @@ import org.apache.poi.ss.usermodel.DataValidation;
 import org.apache.poi.ss.usermodel.DataValidationConstraint;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.util.CellRangeAddressList;
+import org.apache.poi.xssf.usermodel.XSSFDataValidation;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -30,7 +32,7 @@ public class TemplateCellWriteHandlerDate implements SheetWriteHandler {
     /**
      * 避免生成的导入模板下拉值获取不到
      */
-    private static final Integer LIMIT_NUMBER = 10;
+    private static final Integer LIMIT_NUMBER = 1;
    
 
 		
@@ -88,6 +90,14 @@ public class TemplateCellWriteHandlerDate implements SheetWriteHandler {
 	                // 将刚才设置的sheet引用到你的下拉列表中
 	                DataValidationConstraint constraint = helper.createFormulaListConstraint(refers);
 	                DataValidation dataValidation = helper.createValidation(constraint, rangeList);
+	                if(dataValidation instanceof XSSFDataValidation){
+	                	dataValidation.setSuppressDropDownArrow(true);
+						dataValidation.setShowErrorBox(true);
+					}else{
+						dataValidation.setSuppressDropDownArrow(false);
+					}
+
+
 	                writeSheetHolder.getSheet().addValidationData(dataValidation);
 	                // 设置存储下拉列值得sheet为隐藏
 	                int hiddenIndex = workbook.getSheetIndex(sheetName);
@@ -95,17 +105,17 @@ public class TemplateCellWriteHandlerDate implements SheetWriteHandler {
 	                    workbook.setSheetHidden(hiddenIndex, true);
 	                }
 	            }
-	            // 下拉列表约束数据
-	            DataValidationConstraint constraint = helper.createExplicitListConstraint(v);
-	            // 设置约束
-	            DataValidation validation = helper.createValidation(constraint, rangeList);
-	            // 阻止输入非下拉选项的值
-	            validation.setErrorStyle(DataValidation.ErrorStyle.STOP);
-	            validation.setShowErrorBox(true);
-	            validation.setSuppressDropDownArrow(true);
-	            validation.createErrorBox("提示", "此值与单元格定义格式不一致");
-	            // validation.createPromptBox("填写说明：","填写内容只能为下拉数据集中的单位，其他单位将会导致无法入仓");
-	            sheet.addValidationData(validation);
+//	            // 下拉列表约束数据
+//	            DataValidationConstraint constraint = helper.createExplicitListConstraint(v);
+//	            // 设置约束
+//	            DataValidation validation = helper.createValidation(constraint, rangeList);
+//	            // 阻止输入非下拉选项的值
+//	            validation.setErrorStyle(DataValidation.ErrorStyle.STOP);
+//	            validation.setShowErrorBox(true);
+//	            validation.setSuppressDropDownArrow(true);
+//	            validation.createErrorBox("提示", "此值与单元格定义格式不一致");
+//	            // validation.createPromptBox("填写说明：","填写内容只能为下拉数据集中的单位，其他单位将会导致无法入仓");
+//	            sheet.addValidationData(validation);
 	        });	
 		}
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/EquipFeignClient.java

@@ -167,4 +167,21 @@ public interface EquipFeignClient {
      */
     @RequestMapping(value = "/car/simple/{id}", method = RequestMethod.GET)
     ResponseModel<Map<String, Object>> queryCarSimpleInfoById(@PathVariable Long id);
+
+
+
+
+    /**
+     * 统计
+     **/
+    @RequestMapping(value = "/equipSpecificAlarm/getCountAlarm/{type}", method = RequestMethod.GET)
+    ResponseModel<Integer> getCountAlarm(@PathVariable String type);
+
+
+    /**
+     * 统计
+     **/
+    @RequestMapping(value = "/equipSpecificAlarm/getcountAlarmHandle/{type}", method = RequestMethod.GET)
+    ResponseModel<Integer> getcountAlarmHandle(@PathVariable String type);
+
 }

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

@@ -61,7 +61,7 @@ public interface IDutyCommonService {
      * @param instanceId 实例id
      * @return Boolean
      */
-    Boolean deleteDutyData(Long instanceId);
+    Boolean deleteDutyData(Long instanceId, String startTime, String endTime);
 
     /**
      * 查询指定条件的值班人信息

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

@@ -19,7 +19,7 @@
         and s.duty_date >= #{beginDate}
         and s.duty_date <![CDATA[<=]]> #{endDate}
         and s.app_Key = #{appKey}
-        GROUP BY s.duty_date
+        GROUP BY s.duty_date,s.shift_id <!--增添分组条件 根据班次分组技术 -->
         ) a) as maxDutyPersonNumDay,
         (select
              IFNULL(max(num),0)

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

@@ -73,12 +73,13 @@
     </select>
 
     <!--消防队伍列表按时间倒叙排列order by x.rec_date desc 2021-09-08 by kongfm -->
+    <!--BUG 2846 最初开发人员在动态语句后加入分号导致错误  2021-09-10 by kongfm -->
     <select id="listFireTeamById" resultType="com.yeejoin.amos.boot.module.common.api.entity.FireTeam">
         SELECT *
         FROM cb_fire_team
         WHERE is_delete = 0
         <if test="teamId != null">
-            AND tree_code LIKE CONCAT((SELECT tree_code FROM cb_fire_team WHERE sequence_nbr = #{teamId}),'%');
+            AND tree_code LIKE CONCAT((SELECT tree_code FROM cb_fire_team WHERE sequence_nbr = #{teamId}),'%')
         </if>
         order by cb_fire_team.rec_date desc
     </select>

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

@@ -3,7 +3,8 @@
 <mapper
 	namespace="com.yeejoin.amos.boot.module.common.api.mapper.FirefightersMapper">
 
-    <select id="getFirefightersJobTitleCount" resultType="com.yeejoin.amos.boot.biz.common.utils.FirefightersTreeDto">
+	<select id="getFirefightersJobTitleCount"
+		resultType="com.yeejoin.amos.boot.biz.common.utils.FirefightersTreeDto">
 		select COUNT(a.sequence_nbr) num, a.job_title_code jobTitleCode
 		from cb_firefighters a
 		where a.is_delete = 0
@@ -12,7 +13,9 @@
 	<!--消防队员列表按时间倒叙排列add desc 2021-09-08 by kongfm -->
 	<select id="getFirefighters"
 		resultType="com.yeejoin.amos.boot.module.common.api.dto.FirefightersZhDto">
-        select a.*,b.areas_expertise areasExpertise ,b.areas_expertise_code areasExpertiseCode from cb_firefighters a LEFT JOIN cb_firefighters_post b on
+		select a.*,b.areas_expertise areasExpertise ,b.areas_expertise_code
+		areasExpertiseCode from cb_firefighters a LEFT JOIN
+		cb_firefighters_post b on
 		a.sequence_nbr=b.firefighters_id where a.is_delete=0
 		<if test='par.postQualification!=null'>and b.post_qualification_code = #{par.postQualification}</if>
 		<if test='par.areasExpertise!=null'>and b.areas_expertise_code= #{par.areasExpertise}</if>
@@ -20,7 +23,8 @@
 		<if test='par.state!=null'>and a.state_code= #{par.state}</if>
 		<if test='par.fireTeamId!=null'>and a.fire_team_id= #{par.fireTeamId}</if>
 		<if test='par.jobTitle!=null'>and a.job_title_code =#{par.jobTitle}</if>
-         <if test='par.areasExpertiseCode!=null and par.areasExpertiseCode!="0"'>and b.areas_expertise_code =#{par.areasExpertiseCode}</if>
+		<if
+			test='par.areasExpertiseCode!=null and par.areasExpertiseCode!="0"'>and b.areas_expertise_code =#{par.areasExpertiseCode}</if>
 		<if test='par.areasExpertiseCode=="0"'>and b.areas_expertise_code is not null</if>
 		ORDER BY a.rec_date desc limit #{pageNum},#{pageSize}
 	</select>
@@ -35,7 +39,8 @@
 		<if test='par.state!=null'>and a.state_code= #{par.state}</if>
 		<if test='par.fireTeamId!=null'>and a.fire_team_id= #{par.fireTeamId}</if>
 		<if test='par.jobTitle!=null'>and a.job_title_code =#{par.jobTitle}</if>
-        <if test='par.areasExpertiseCode!=null and par.areasExpertiseCode!="0"'>and b.areas_expertise_code =#{par.areasExpertiseCode}</if>
+		<if
+			test='par.areasExpertiseCode!=null and par.areasExpertiseCode!="0"'>and b.areas_expertise_code =#{par.areasExpertiseCode}</if>
 		<if test='par.areasExpertiseCode=="0"'>and b.areas_expertise_code is not null</if>
 
 		ORDER BY a.rec_date desc
@@ -69,13 +74,21 @@
 	</select>
 
 
-    <!-- BUG3553 BY kongfm 人员关系显示汉字-->
-    <select id="exportToExcel" resultType="com.yeejoin.amos.boot.module.common.api.dto.FirefightersExcelDto">
-        select f.*,
-       (select  cb_fire_team.name  from  cb_fire_team where cb_fire_team.sequence_nbr=f.fire_team_id) fireTeam,
-        emergency_contact, (select da.name from cb_data_dictionary da where da.code = fc.relationship) as relationship , emergency_contact_phone
-        from cb_firefighters f
-                 left join cb_firefighters_contacts fc on f.sequence_nbr = fc.firefighters_id
+	<!-- BUG3553 BY kongfm 人员关系显示汉字 -->
+	<select id="exportToExcel"
+		resultType="com.yeejoin.amos.boot.module.common.api.dto.FirefightersExcelDto">
+		SELECT
+		f.*,
+		( SELECT cb_fire_team.NAME FROM cb_fire_team WHERE
+		cb_fire_team.sequence_nbr = f.fire_team_id ) fireTeam,
+		emergency_contact,
+		da.NAME AS relationship,
+		emergency_contact_phone
+		FROM
+		cb_firefighters f
+		LEFT JOIN cb_firefighters_contacts fc ON f.sequence_nbr =
+		fc.firefighters_id
+		left join cb_data_dictionary da on da.CODE = fc.relationship
 		where f.is_delete = #{isDelete}
 	</select>
 

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

@@ -182,7 +182,7 @@
 		cb_linkage_unit clu
 		WHERE clu.is_delete=0
 		<if test="unitName != null and unitName != ''">
-			AND clu.unit_name LIKE concat(#{unitName}, '%')
+			AND clu.unit_name LIKE concat('%',#{unitName}, '%')
 		</if>
 		<if
 			test="linkageUnitType != null and linkageUnitType != ''">

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

@@ -17,7 +17,7 @@ public  enum ExcelEnums {
         WXXFZ("微型消防站", "微型消防站", "com.yeejoin.amos.boot.module.common.api.dto.FireStationDto","WXXFZ"),//("WXXFZ","微型消防站")
         XFRY ("消防人员", "消防人员", "com.yeejoin.amos.boot.module.common.api.dto.FirefightersExcelDto","XFRY"),//("XFRY","消防人员")
         WBRY ("维保人员", "维保人员", "com.yeejoin.amos.boot.module.common.api.dto.MaintenancePersonExcleDto","WBRY"),//("WBRY",维保人员)
-        KEYSITE ("重點部位", "重點部位", "com.yeejoin.amos.boot.module.common.api.dto.KeySiteExcleDto","KEYSITE"),//{"KEYSITE":重點部位}
+        KEYSITE ("重点部位", "重点部位", "com.yeejoin.amos.boot.module.common.api.dto.KeySiteExcleDto","KEYSITE"),//{"KEYSITE":重點部位}
         CLZQ ("车辆执勤", "车辆执勤", "com.yeejoin.amos.boot.module.common.api.dto.DutyCarExcelDto","CLZQ"),//("CLZQ","车辆执勤")
         JCDWRY ("机场单位人员", "机场单位人员", "com.yeejoin.amos.boot.module.common.api.dto.OrgUsrExcelDto","JCDWRY"),//("JCDW","机场单位")
         LDDW ("联动单位", "联动单位", "com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto","LDDW"),//("JCDW","机场单位")

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

@@ -11,7 +11,9 @@ import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+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;
 
@@ -127,13 +129,21 @@ public class DutyCarController extends BaseController {
      * 值班数据删除
      *
      * @param instanceId 实例id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
      * @return ResponseModel
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping("/{instanceId}")
     @ApiOperation(httpMethod = "DELETE", value = "值班数据删除", notes = "值班数据删除")
-    public ResponseModel deleteDutyData(@PathVariable Long instanceId) {
-        return ResponseHelper.buildResponse(iDutyCarService.deleteDutyData(instanceId));
+    public ResponseModel deleteDutyData(@PathVariable Long instanceId,@PathVariable String startTime,@PathVariable String endTime) {
+        if (ValidationUtil.isEmpty(instanceId)
+                || ValidationUtil.isEmpty(startTime)
+                || ValidationUtil.isEmpty(endTime)){
+            throw new BadRequest("参数校验失败.");
+        }
+        // BUG 2807 删除逻辑缺陷，现在前端后端传入 删除月份 2021-09-10 by kongfm
+        return ResponseHelper.buildResponse(iDutyCarService.deleteDutyData(instanceId, startTime, endTime));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -11,7 +11,9 @@ import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+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;
 
@@ -116,13 +118,21 @@ public class DutyPersonController extends BaseController {
      * 值班数据删除
      *
      * @param instanceId 实例id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
      * @return ResponseModel
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping("/{instanceId}")
+    @DeleteMapping("/{instanceId}/{startTime}/{endTime}")
     @ApiOperation(httpMethod = "DELETE", value = "值班数据删除", notes = "值班数据删除")
-    public ResponseModel deleteDutyData(@PathVariable Long instanceId) {
-        return ResponseHelper.buildResponse(iDutyPersonService.deleteDutyData(instanceId));
+    public ResponseModel deleteDutyData(@PathVariable Long instanceId,@PathVariable String startTime,@PathVariable String endTime) {
+        if (ValidationUtil.isEmpty(instanceId)
+                || ValidationUtil.isEmpty(startTime)
+                || ValidationUtil.isEmpty(endTime)){
+            throw new BadRequest("参数校验失败.");
+        }
+        // BUG 2807 删除逻辑缺陷，现在前端后端传入 删除月份 2021-09-10 by kongfm
+        return ResponseHelper.buildResponse(iDutyPersonService.deleteDutyData(instanceId, startTime, endTime));
     }
 
     /**

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

@@ -20,7 +20,6 @@ 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.LinkageUnitDto;
-import com.yeejoin.amos.boot.module.common.api.entity.LinkageUnit;
 import com.yeejoin.amos.boot.module.common.api.service.ILinkageUnitService;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.LinkageUnitServiceImpl;
 

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

@@ -79,7 +79,7 @@ public class OrgPersonController {
     @ApiOperation(httpMethod = "PUT", value = "更新单位数据", notes = "更新单位数据")
     public ResponseModel<?> updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgPersonDto OrgPersonVo,
                                              @PathVariable Long id) throws Exception {
-        //OrgPersonVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
+        OrgPersonVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
         iOrgUsrService.updateByIdOrgPerson(OrgPersonVo, id);
         return ResponseHelper.buildResponse(null);
     }

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

@@ -87,7 +87,10 @@ public class OrgUsrController extends BaseController {
                 return ResponseHelper.buildResponse("-1");
             }
         }
-        iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", id).set("is_delete", CommonConstant.IS_DELETE_01));
+//        iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", id).set("is_delete", CommonConstant.IS_DELETE_01));
+        /*bug 2812 一次删除多条数据  传入类型修改为string 问题解决 2021-09-09 陈召 开始*/
+      iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", String.valueOf(id)).set("is_delete", CommonConstant.IS_DELETE_01));
+        /*bug 2812 一次删除多条数据  传入类型修改为string 问题解决 2021-09-09 陈召 结束*/
         try {
             eSOrgUsrService.deleteById(id);
             emqKeeper.getMqttClient().publish(airportDeleteTopic, JSON.toJSONString(id).getBytes(), 2, false);
@@ -108,6 +111,7 @@ public class OrgUsrController extends BaseController {
     @RequestMapping(value = "/{id}", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "更新单位数据", notes = "更新单位数据")
     public ResponseModel<?> updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgUsrDto OrgUsrVo, @PathVariable Long id) throws Exception {
+
         OrgUsrVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
         iOrgUsrService.updateByIdOrgUsr(OrgUsrVo, id);
         return ResponseHelper.buildResponse(null);
@@ -337,7 +341,7 @@ public class OrgUsrController extends BaseController {
      * @param
      * @return
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/companyTreeByUser", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据登陆人获取单位部门树", notes = "根据登陆人获取单位部门树")
     public ResponseModel<List<OrgMenuDto>> selectCompanyTreeByUser() throws Exception {
@@ -353,7 +357,7 @@ public class OrgUsrController extends BaseController {
      * @param
      * @return
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/companyUserTreeByUser", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据登陆人获取单位部门用户树", notes = "根据登陆人获取单位部门用户树")
     public ResponseModel<List<OrgMenuDto>> companyUserTreeByUser() {
@@ -369,7 +373,7 @@ public class OrgUsrController extends BaseController {
      * @param
      * @return
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/companyListByUser", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据登陆人获取单位列表", notes = "根据登陆人获取单位列表")
     public ResponseModel<List<CheckObjectDto>> companyListByUser() {
@@ -399,7 +403,7 @@ public class OrgUsrController extends BaseController {
      * @param
      * @return
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getLoginUserDetails", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取登陆人绑定的人员关系", notes = "获取登陆人绑定的人员关系")
     public ResponseModel<List<Map<String, Object>>> getLoginUserDetails(@RequestParam(value = "userId", required = false) String userId) {

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

@@ -100,7 +100,6 @@ public class WaterResourceController extends BaseController {
             model.setLongitude(Double.valueOf(address.getString(BizConstant.LONGITUDE)));
             model.setLatitude(Double.valueOf(address.getString(BizConstant.LATITUDE)));
 		 }*/
-         
         if (!StringUtils.isEmpty(resourceType)) {
             switch (resourceType) {
                 case "hydrant":
@@ -176,8 +175,6 @@ public class WaterResourceController extends BaseController {
             model.setLongitude(Double.valueOf(address.getString(BizConstant.LONGITUDE)));
             model.setLatitude(Double.valueOf(address.getString(BizConstant.LATITUDE)));
         }*/
-      
-
         // 更新基本信息
         model.setSequenceNbr(sequenceNbr);
         model.setRealityImg(JSONArray.toJSONString(model.getRealityImgList()));

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

@@ -85,16 +85,43 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 	}
 
 	private void fillDutyShiftData(String beginDate, String endDate, Map<String, Object> m) throws ParseException {
+		// 获取值班的实例id
 		String instanceId = m.get("instanceId").toString();
+		// 根据appkey 获取未删除的值班班次
 		List<DutyShift> dutyShifts = dutyShiftService.list(new LambdaQueryWrapper<DutyShift>()
 				.eq(BaseEntity::getIsDelete, false).eq(DutyShift::getAppKey, RequestContext.getAppKey()));
+		// 根据id 保存成key -value
 		Map<Long, DutyShift> keyNameMap = dutyShifts.stream()
 				.collect(Collectors.toMap(BaseEntity::getSequenceNbr, Function.identity()));
+		// 根据时间 查询值班关系表
+
+		// BUG 2806 获取月份第一天和最后一天  2021-09-09 by kongfm
+			if(beginDate != null ) {
+			Calendar c = Calendar.getInstance();
+			c.setTime(DateUtils.longStr2Date(beginDate));
+			c.set(Calendar.DAY_OF_MONTH, 1);
+			c.set(Calendar.HOUR_OF_DAY,0);
+			c.set(Calendar.MINUTE,0);
+			c.set(Calendar.SECOND,0);
+			beginDate = DateUtils.date2LongStr(c.getTime());
+		}
+		if(endDate != null ) {
+			Calendar c = Calendar.getInstance();
+			c.setTime(DateUtils.longStr2Date(beginDate));
+			c.add(Calendar.MONTH, 1);
+			c.set(Calendar.DAY_OF_MONTH, 1);
+			c.add(Calendar.DATE, -1);
+			c.set(Calendar.HOUR_OF_DAY,23);
+			c.set(Calendar.MINUTE,59);
+			c.set(Calendar.SECOND,59);
+			endDate = DateUtils.date2LongStr(c.getTime());
+		}
 		List<DutyPersonShiftDto> personShiftList = dutyPersonShiftService
 				.list(new LambdaQueryWrapper<DutyPersonShift>().eq(DutyPersonShift::getInstanceId, instanceId)
 						.ge(beginDate != null, DutyPersonShift::getDutyDate, beginDate)
 						.le(endDate != null, DutyPersonShift::getDutyDate, endDate))
 				.stream().map(e -> {
+					// 值班关系查询到以后 重新封装
 					DutyPersonShiftDto dto = new DutyPersonShiftDto();
 					Bean.copyExistPropertis(e, dto);
 					// 没值班信息，默认休
@@ -152,6 +179,7 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 	public List<Map<String, Object>> list(Long teamId, String beginDate, String endDate) throws ParseException {
 		// 1.已column为准 进行返回
 		String groupCode = this.getGroupCode();
+		// 动态表单查询所有值班信息
 		List<Map<String, Object>> list = dynamicFormInstanceService.listAll(groupCode);
 		
 		// 2.组织值班数据
@@ -298,11 +326,11 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 	}
 
 	@Override
-	public Boolean deleteDutyData(Long instanceId) {
-		dynamicFormInstanceService.remove(
-				new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getInstanceId, instanceId));
+	public Boolean deleteDutyData(Long instanceId, String startTime, String endTime) {
+        // BUG 2807 删除逻辑缺陷，现在前端后端传入 删除月份 2021-09-10 by kongfm
+		//dynamicFormInstanceService.remove(new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getInstanceId, instanceId));
 		dutyPersonShiftService
-				.remove(new LambdaQueryWrapper<DutyPersonShift>().eq(DutyPersonShift::getInstanceId, instanceId));
+				.remove(new LambdaQueryWrapper<DutyPersonShift>().ge(DutyPersonShift::getDutyDate,startTime).le(DutyPersonShift::getDutyDate,endTime).eq(DutyPersonShift::getInstanceId, instanceId));
 		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/KeySiteServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto;
 import com.yeejoin.amos.boot.module.common.api.dto.KeySiteExcleDto;
@@ -259,16 +260,28 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 				}
 				keySiteDto.setUseNatureName(useNatureArray[0]);
 			}
-			if (keySiteExcleDto.getFirePreventionFlagName().equals("有")) {
+			if ("有".equals(keySiteExcleDto.getFirePreventionFlagName())) {
 				keySiteDto.setFirePreventionFlag(true);
 			} else {
 				keySiteDto.setFirePreventionFlag(false);
 			}
+			keySiteDto =Bean.toPo(getCurrentInfo(), keySiteDto);
 			excelList.add(keySiteDto);
 		}
 		return this.saveBatch(excelList);
 	}
-
+	public BaseEntity getCurrentInfo() {
+		BaseEntity userModel= new BaseEntity();
+	/*		String keyString=	RequestContext.getExeUserId();
+	String token=RequestContext.getToken();
+		ReginParams params = JSONObject.parseObject(redisUtils
+				.get(RedisKey.buildReginKey(keyString, token)).toString(),
+				ReginParams.class);*/
+		userModel.setRecUserId("3141675");		
+		userModel.setRecUserName("admin_jcs");
+		userModel.setRecDate( new Date());
+		return userModel;
+	}
 	@Override
 	public List<OrgMenuDto> getBuildAndKeyTree(Long sequenceNbr) {
 		LambdaQueryWrapper<KeySite> mapper =new LambdaQueryWrapper<KeySite>();

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.google.common.collect.Lists;
-import com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.repository.query.Param;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,20 +18,21 @@ import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+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.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 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.NameUtils;
-import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
 import com.yeejoin.amos.boot.module.common.api.dto.FireTeamCardDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FireTeamListDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FireTeamServiceImpl;
 
@@ -91,6 +88,13 @@ public class FireTeamController extends BaseController {
     @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "修改消防队伍", notes = "修改消防队伍")
     public ResponseModel<Object> updateByIdFireTeam(HttpServletRequest request, @RequestBody FireTeam fireTeam) {
+        if (ValidationUtil.isEmpty(fireTeam.getSequenceNbr())){
+            throw new BadRequest("更新消防队伍必须传入主键");
+        }
+        // BUG 2842  由 BUG2217 2684 新增业务 需要统计消防队伍旗下所有消防队伍信息导致数据逻辑错误 返回错误提示 2021-09-10 by kongfm
+        if(fireTeam.getSequenceNbr().equals(fireTeam.getParent())) {
+            throw new BadRequest("消防队伍上级不可选为自己");
+        }
         return ResponseHelper.buildResponse(iFireTeamService.saveFireTeam(fireTeam));
     }
 

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

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 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.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
@@ -130,7 +131,8 @@ public class FirefightersController extends BaseController {
 		queryWrapper.eq("is_delete", 0);
 		List<FirefightersJacket> firefightersJacket = iFirefightersJacketService.list(queryWrapper);
 		if (firefightersJacket != null && firefightersJacket.size() > 0) {
-			throw new RuntimeException("该消防还有在装装备！");
+			// BUG 2222 by litw start 2021年9月10日
+			throw new BadRequest("该消防还有在装装备！");
 		}
 		try {
 			iFirefightersService.update(new UpdateWrapper<Firefighters>().eq("sequence_nbr", id).set("is_delete", 1));

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
 import com.yeejoin.amos.boot.biz.common.service.IHomePageService;
+import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.annotation.PostConstruct;
 
 /**
  * @description:
@@ -11,12 +17,20 @@ import org.springframework.stereotype.Service;
 @Service
 public class FaultServiceImpl implements IHomePageService {
 
-    //实现首页dispatchMap
+    @Autowired
+    EquipFeignClient quipFeignClient;
+    private  static  EquipFeignClient quipFeignClient1;
+
+    @PostConstruct
+    public void init(){
+        quipFeignClient1=  quipFeignClient;
+    }
 
+    //火警
     @Override
     public Object getHomePageData() {
 
-
-        return 0;
+        ResponseModel<Integer> data=   quipFeignClient1.getCountAlarm("BREAKDOWN");
+        return data!=null?data.getResult():0;
     }
 }

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
 import com.yeejoin.amos.boot.biz.common.service.IHomePageService;
+import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertCalledMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.annotation.PostConstruct;
 
 /**
  * @description:
@@ -11,12 +18,20 @@ import org.springframework.stereotype.Service;
 @Service
 public class FireAlarmServiceImpl implements IHomePageService {
 
-    //实现首页dispatchMap
+    @Autowired
+    EquipFeignClient quipFeignClient;
+    private  static  EquipFeignClient quipFeignClient1;
+
+    @PostConstruct
+    public void init(){
+        quipFeignClient1=  quipFeignClient;
+    }
 
+    //火警
     @Override
     public Object getHomePageData() {
 
-
-        return 0;
+        ResponseModel<Integer> data=   quipFeignClient1.getCountAlarm("FIREALARM");
+        return data!=null?data.getResult():0;
     }
 }

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

@@ -200,8 +200,8 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
         if(fireTeam.getAddress()!=null){
             JSONObject address = WaterResourceServiceImpl.getLongLatFromAddress(fireTeam.getAddress());
             fireTeam.setAddress(address.getString(BizConstant.ADDRESS));
-            fireTeam.setLongitude(Double.valueOf(address.getString(BizConstant.LONGITUDE)));
-            fireTeam.setLatitude(Double.valueOf(address.getString(BizConstant.LATITUDE)));
+           // fireTeam.setLongitude(Double.valueOf(address.getString(BizConstant.LONGITUDE)));
+           // fireTeam.setLatitude(Double.valueOf(address.getString(BizConstant.LATITUDE)));
         }
         if (ValidationUtil.isEmpty(fireTeam.getParent())) {
             fireTeam.setTreeCode(TreeParser.genTreeCode());

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
 import com.yeejoin.amos.boot.biz.common.service.IHomePageService;
+import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.annotation.PostConstruct;
 
 /**
  * @description:
@@ -11,12 +17,20 @@ import org.springframework.stereotype.Service;
 @Service
 public class NoServiceImpl implements IHomePageService {
 
-    //实现首页dispatchMap
+    @Autowired
+    EquipFeignClient quipFeignClient;
+    private  static  EquipFeignClient quipFeignClient1;
+
+    @PostConstruct
+    public void init(){
+        quipFeignClient1=  quipFeignClient;
+    }
 
+    //火警
     @Override
     public Object getHomePageData() {
 
-
-        return 0;
+        ResponseModel<Integer> data=   quipFeignClient1.getcountAlarmHandle("no");
+        return data!=null?data.getResult():0;
     }
 }

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
 import com.yeejoin.amos.boot.biz.common.service.IHomePageService;
+import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.annotation.PostConstruct;
 
 /**
  * @description:
@@ -11,12 +17,20 @@ import org.springframework.stereotype.Service;
 @Service
 public class ShieldServiceImpl implements IHomePageService {
 
-    //实现首页dispatchMap
+    @Autowired
+    EquipFeignClient quipFeignClient;
+    private  static  EquipFeignClient quipFeignClient1;
+
+    @PostConstruct
+    public void init(){
+        quipFeignClient1=  quipFeignClient;
+    }
 
+    //火警
     @Override
     public Object getHomePageData() {
 
-
-        return 0;
+        ResponseModel<Integer> data=   quipFeignClient1.getCountAlarm("SHIELD");
+        return data!=null?data.getResult():0;
     }
 }

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
 import com.yeejoin.amos.boot.biz.common.service.IHomePageService;
+import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.annotation.PostConstruct;
 
 /**
  * @description:
@@ -11,12 +17,20 @@ import org.springframework.stereotype.Service;
 @Service
 public class WarningServiceImpl implements IHomePageService {
 
-    //实现首页dispatchMap
+    @Autowired
+    EquipFeignClient quipFeignClient;
+    private  static  EquipFeignClient quipFeignClient1;
+
+    @PostConstruct
+    public void init(){
+        quipFeignClient1=  quipFeignClient;
+    }
 
+    //火警
     @Override
     public Object getHomePageData() {
 
-
-        return 0;
+        ResponseModel<Integer> data=   quipFeignClient1.getCountAlarm("NOTICE");
+        return data!=null?data.getResult():0;
     }
 }

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
 import com.yeejoin.amos.boot.biz.common.service.IHomePageService;
+import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.annotation.PostConstruct;
 
 /**
  * @description:
@@ -11,12 +17,20 @@ import org.springframework.stereotype.Service;
 @Service
 public class YesServiceImpl implements IHomePageService {
 
-    //实现首页dispatchMap
+    @Autowired
+    EquipFeignClient quipFeignClient;
+    private  static  EquipFeignClient quipFeignClient1;
+
+    @PostConstruct
+    public void init(){
+        quipFeignClient1=  quipFeignClient;
+    }
 
+    //火警
     @Override
     public Object getHomePageData() {
 
-
-        return 0;
+        ResponseModel<Integer> data=   quipFeignClient1.getcountAlarmHandle("yes");
+        return data!=null?data.getResult():0;
     }
 }

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

-spring.application.name=JCS-chenhao
+spring.application.name=JCS
 server.servlet.context-path=/jcs
 server.port=11100
 spring.profiles.active=dev
@@ -7,10 +7,10 @@ spring.jackson.time-zone=GMT+8
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 logging.config=classpath:logback-${spring.profiles.active}.xml
 
-## mybatis-plus配置控制台打印完整带参数SQL语句
+## mybatis-plus配置控制台打印完整带参数SQL语句
 mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 
-## redis失效时间
+## redis失效时间
 redis.cache.failure.time=10800
 
 ## unit(h)
@@ -52,13 +52,13 @@ spring.redis.lettuce.pool.min-idle=0
 spring.redis.expire.time=300
 #在重启服务的过程中是否清空缓存的标识符 --2021-09-09
 my.spring.redis.cache.isclean=false
-## mqtt-警情初报消息主题
+## mqtt-警情初报消息主题
 mqtt.topic.alert.reporting=alertReporting
 
-## 实战指挥新警情�?�报主题
+## 实战指挥新警情主题
 mqtt.topic.command.alert.notice=alertNotice
 
-## 跑马灯地震，天气预警信息
+## 跑马灯地震、天气预警信息
 mqtt.topic.command.meteorological.notice=meteorological
 
 mqtt.topic.command.power.deployment=power
@@ -72,8 +72,8 @@ iot.fegin.name=AMOS-API-IOT
 
 equip.fegin.name=AMOS-EQUIPMANAGE
 
-## 设备联动服务（车库门、广播、警铃）
+## 设备联动服务（车库门、广播、警铃）
 control.fegin.name=JCS-API-CONTROL
 
-## 故障报修流程
+## 故障报修流程
 failure.work.flow.processDefinitionKey=malfunction_repair
\ No newline at end of file