Merge remote-tracking branch 'origin/develop_dl_3.7.0.9' into develop_dl_3.7.0.9

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

@@ -22,7 +22,6 @@ import lombok.EqualsAndHashCode;
 @ApiModel(value="OrgUsr对象", description="人员信息")
 public class OrgPersonDto extends BaseDto {
 
-
     /**
 	 * 
 	 */
@@ -82,4 +81,6 @@ public class OrgPersonDto extends BaseDto {
     @ApiModelProperty(value = "动态表单值")
     private List<DynamicFormInstance> dynamicFormValue;
 
+    private String personImg;
+
 }

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

@@ -99,4 +99,6 @@ public class OrgUsrDto extends BaseDto {
 
     @ApiModelProperty(value = "消防信息实体")
     private CompanyInfo companyInfo;
+
+    private String personImg;
 }

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

@@ -90,4 +90,7 @@ public class OrgUsr extends BaseEntity {
     @ApiModelProperty(value = "管理类别")
     @TableField(exist = false)
     private String managementType;
+
+    @ApiModelProperty(value = "人员照片")
+    private String personImg;
 }

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

@@ -20,9 +20,32 @@
         SELECT
             (
                 SELECT
-                    Ifnull  (GROUP_CONCAT( cou.biz_org_name ),'') AS
-                value
-
+                    Ifnull  (GROUP_CONCAT( cou.biz_org_name ),'') AS value
+        FROM
+            (
+            SELECT
+            cdfi.field_value AS userId
+            FROM
+            cb_dynamic_form_instance cdfi
+            WHERE
+            cdfi.instance_id IN (
+            SELECT
+            cdps.instance_id
+            FROM
+            cb_duty_person_shift cdps
+            LEFT JOIN cb_dynamic_form_instance cdfi ON cdps.instance_id = cdfi.instance_id
+            WHERE
+            cdfi.field_code = 'postType'
+            AND field_value = '1676'
+            AND cdps.duty_date = ( SELECT DATE_FORMAT(NOW(),"%Y-%m-%d"))
+            )
+            AND cdfi.field_code = 'userId'
+            ) temp
+            LEFT JOIN cb_org_usr cou ON cou.sequence_nbr = temp.userId WHERE cou.is_delete = 0
+            ) AS value,
+                                                                           (
+        SELECT
+            Ifnull(GROUP_CONCAT( dfi.field_value ),'') AS tel
         FROM
             (
             SELECT
@@ -43,11 +66,8 @@
             )
             AND cdfi.field_code = 'userId'
             ) temp
-            LEFT JOIN cb_org_usr cou ON cou.sequence_nbr = temp.userId
-        WHERE cou.is_delete = 0
-            ) AS
-            value
-            ,
+            LEFT JOIN cb_dynamic_form_instance dfi ON dfi.instance_id = temp.userId WHERE dfi.field_code = 'telephone'
+            ) AS tel,
             '当值值长' AS name
     </select>
     <select id="getOrganizationList" resultType="java.util.Map">

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

@@ -778,9 +778,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	public String getPersonImg(String id) {
 		Long userId = Long.valueOf(id);
 		OrgUsr orgUsr = this.baseMapper.queryByUserId(userId);
-		List<DynamicFormInstanceDto> list = alertFormValueServiceImpl.listBySeqnum(orgUsr.getSequenceNbr());
-		String str = list.get(0).getFieldValue();
-		return str;
+		return orgUsr.getPersonImg();
 	}
 
 	public List<FormValue> getFormValueDetail(Long id) throws Exception {
@@ -2964,6 +2962,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		orgUsr.setBizOrgName(peopleBasicInfoDto.getName());
 		orgUsr.setParentId(peopleBasicInfoDto.getCompany());
 		orgUsr.setParentName(peopleBasicInfoDto.getBizOrgName());
+		orgUsr.setPersonImg(peopleBasicInfoDto.getPersonImg());
 		orgUsr.setIsDelete(false);
 		return orgUsr;
 	}

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/ConfigureController.java

@@ -847,7 +847,9 @@ public class ConfigureController extends AbstractBaseController {
             list.forEach(e->
                     iFireFightingSystemService.iotDayReport(e.get("bizOrgCode"), finalStartDate, finalEndDate)
             );
+            log.info("定时生成 物联报表-日执行结束");
         } catch (Exception e) {
+            log.info("定时生成 物联报表-日执行报错");
             e.printStackTrace();
         }
         return CommonResponseUtil.success();

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/TopographyController.java

@@ -1437,13 +1437,17 @@ public class TopographyController extends AbstractBaseController {
 
 
     private Date dateParse(String value) throws ParseException {
-        String strDate = value.substring(0, 19);
-        SimpleDateFormat sdf = new SimpleDateFormat(ISO8601_DATE_HOUR_MIN_SEC);
-        SimpleDateFormat sdf1 = new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN);
-        sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
-        Date date = sdf.parse(strDate);
-        String time = DateTimeUtil.format(date, DateTimeUtil.ISO_DATE_HOUR24_MIN_SEC);
-        return  sdf1.parse(time);
+        if(value.length() > 19) {
+            String strDate = value.substring(0, 19);
+            SimpleDateFormat sdf = new SimpleDateFormat(ISO8601_DATE_HOUR_MIN_SEC);
+            SimpleDateFormat sdf1 = new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN);
+            sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
+            Date date = sdf.parse(strDate);
+            String time = DateTimeUtil.format(date, DateTimeUtil.ISO_DATE_HOUR24_MIN_SEC);
+            return  sdf1.parse(time);
+        } else {
+            return DateUtils.dateParse(value, DateUtils.DATE_TIME_PATTERN);
+        }
     }
 
     /***

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/ApplicationRunnerImpl.java

@@ -62,6 +62,6 @@ public class ApplicationRunnerImpl implements ApplicationRunner {
         iSourceStatistics.initAllCategoryStatisticsData(SourceTypeEnum.IOT);
 
         maintenanceResourceDataService.subscribeTopic();
-        emqKeeper.getMqttClient().subscribe(ConfigPageTopicEnum.INTEGRATE.getTopic(), 2, integratePageDataListener);
+        emqKeeper.subscript(ConfigPageTopicEnum.INTEGRATE.getTopic(), 2, integratePageDataListener);
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FormInstanceEquipServiceImpl.java

@@ -214,11 +214,16 @@ public class FormInstanceEquipServiceImpl extends ServiceImpl<FormInstanceEquipM
     @Override
     @Transactional(rollbackFor = {Exception.class, BaseException.class})
     public Object updateForm(Long instanceId, String orgCode, Map<String, Object> map, String groupCode) {
-        if (com.yeejoin.equipmanage.common.utils.StringUtil.isNotEmpty(groupCode)) {
-            map.keySet().forEach(x -> {
-                formInstanceEquipMapper.updateFormFieldValue(instanceId, x, String.valueOf(map.get(x)));
-            });
-            return CommonResponseUtil.success();
+        List<FormInstanceEquip> list = this.queryByInstanceId(instanceId);
+        if (CollectionUtils.isEmpty(list)) {
+            saveForm(groupCode, orgCode, map, String.valueOf(instanceId));
+        } else {
+            if (com.yeejoin.equipmanage.common.utils.StringUtil.isNotEmpty(groupCode)) {
+                map.keySet().forEach(x -> {
+                    formInstanceEquipMapper.updateFormFieldValue(instanceId, x, String.valueOf(map.get(x)));
+                });
+                return CommonResponseUtil.success();
+            }
         }
         return null;
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/config/StartLoader.java

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.AlertNewsDto;
 import com.yeejoin.amos.component.rule.config.ClazzUtils;
 import com.yeejoin.amos.component.rule.config.RuleConfig;
 import org.eclipse.paho.client.mqttv3.MqttException;
+import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +16,7 @@ import org.springframework.boot.ApplicationRunner;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import org.typroject.tyboot.component.emq.EmqKeeper;
+import org.typroject.tyboot.component.emq.EmqxListener;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.util.List;
@@ -43,22 +45,25 @@ public class StartLoader implements ApplicationRunner {
 
     public void loadSysParams(){
         try {
-            emqKeeper.getMqttClient().subscribe(topic, (s, mqttMessage) -> {
-                byte[] payload = mqttMessage.getPayload();
+            emqKeeper.subscript(topic, 1, new EmqxListener() {
+                @Override
+                public void processMessage(String s, MqttMessage mqttMessage) throws Exception {
+                    byte[] payload = mqttMessage.getPayload();
 
                     String obj = new String(payload);
                     if (!ValidationUtil.isEmpty(obj)) {
                         JSONObject json = JSON.parseObject(obj);
                         AlertNewsDto alertNewsDto = new AlertNewsDto( "物联警情",
-                                  "物联设备发生警情，发生位置:"+(json.get("address")!=null?json.get("address").toString():"")+
+                                "物联设备发生警情，发生位置:"+(json.get("address")!=null?json.get("address").toString():"")+
                                         ",事发单位:"+(json.get("unitInvolvedName")!=null?json.get("unitInvolvedName").toString():"")
                                         +",联系人:"+(json.get("contactUser")!=null?json.get("contactUser").toString():"")
                                         +",联系电话:"+(json.get("contactPhone")!=null?json.get("contactPhone").toString():"")+".请尽快处理！",
-                                   json.get("id").toString(),  json);
+                                json.get("id").toString(),  json);
                         emqKeeper.getMqttClient().publish(topicweb, JSON.toJSON(alertNewsDto).toString().getBytes("UTF-8"), 1, false);
-                 }
+                    }
+                }
             });
-        } catch (MqttException e) {
+        } catch (Exception e) {
             logger.info("订阅物联警情异常", e);
         }
     }

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

@@ -5,6 +5,7 @@ import java.util.*;
 import javax.servlet.http.HttpServletRequest;
 
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.common.api.entity.*;
 import com.yeejoin.amos.boot.module.common.api.enums.ExceptionEnum;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -50,14 +51,6 @@ import com.yeejoin.amos.boot.module.common.api.dto.FirefightersZhDto;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
 import com.yeejoin.amos.boot.module.common.api.dto.PeopleBasicInfoDto;
 import com.yeejoin.amos.boot.module.common.api.dto.PeopleInfoDto;
-import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
-import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
-import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContacts;
-import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContract;
-import com.yeejoin.amos.boot.module.common.api.entity.FirefightersEducation;
-import com.yeejoin.amos.boot.module.common.api.entity.FirefightersJacket;
-import com.yeejoin.amos.boot.module.common.api.entity.FirefightersPost;
-import com.yeejoin.amos.boot.module.common.api.entity.FirefightersThought;
 import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FireTeamServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersContactsServiceImpl;

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

@@ -47,29 +47,13 @@ public class OrganizationImpl extends BaseService<Organization, Organization, Or
             // 获取值长
             Map<String, Object> resMap = this.baseMapper.getTeamLeader();
             Map<String, Object> leaderMap = new HashMap<>();
-            resMap.put("name", "当值值长");
-            resMap.put("value", "aaa");
             if (ObjectUtils.isEmpty(resMap.get("value"))) {
                 leaderMap.put("name", resMap.get("name") + "");
                 leaderMap.put("value", "");
             } else {
-                List<Organization> collect = organizations.stream().filter(x -> x.getEmergencyTeamName().equals(resMap.get("name"))).collect(Collectors.toList());
-                if (0 < collect.size()) {
-                    Organization organizationEntity = collect.get(0);
-                    String[] nameArr = organizationEntity.getGroupLeader().split(",");
-                    List<String> nameList = Arrays.asList(nameArr);
-                    String[] telArr = new String[nameList.size()];
-                    if (ObjectUtils.isNotEmpty(organizationEntity.getGroupLeaderTel())) {
-                        telArr = organizationEntity.getGroupLeaderTel().split("\n");
-                    }
-                    List<String> telList = Arrays.asList(telArr);
-                    List<String> valueList = new ArrayList<>();
-                    for (int i = 0; i < nameList.size(); i++) {
-                        valueList.add(nameList.get(i) + "-" + telList.get(i));
-                    }
-                    leaderMap.put("name", resMap.get("name") + "");
-                    leaderMap.put("value", String.join(",", valueList));
-                }
+                // 跟现场确认此处值长只有一人，所以只做一人处理
+                leaderMap.put("name", resMap.get("name") + " " + "1人");
+                leaderMap.put("value", resMap.get("value") + "-" + resMap.get("tel"));
             }
             res.add(leaderMap);
 

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

@@ -752,6 +752,23 @@ public class InputItemController extends AbstractBaseController {
 				map.put("OkScore",param.getOkScore()!=null?param.getOkScore():0);
 				map.put("NoScore",param.getNoScore()!=null?param.getNoScore():0);
 				map.put("CheckType",param.getCheckType());
+				String inputClassify = "";
+				switch(param.getInputClassify()) {
+					case "WGJC":
+						inputClassify = "外观检查";
+						break;
+					case "GNCS":
+						inputClassify = "功能测试";
+						break;
+					case "HJJC":
+						inputClassify = "环境检查";
+						break;
+					case "QT":
+						inputClassify = "其他";
+						break;
+					default:
+				}
+				inputItem.setInputClassify(inputClassify);
 				inputItem.setDataJson(JSONObject.toJSONString(map));
 
 			}else if(param.getItemType().equals("选择")){
@@ -771,10 +788,10 @@ public class InputItemController extends AbstractBaseController {
 				map.put("ValidDown",param.getValidDown()!=null?param.getValidDown():"");
 				map.put("OkUp",param.getOkUp()!=null?param.getOkUp():"");
 				map.put("OkDown",param.getOkDown()!=null?param.getOkDown():"");
-				map.put("CheckValidUp",param.getCheckValidUp().equals("false")?false:true);
-				map.put("CheckValidDown",param.getCheckValidDown().equals("false")?false:true);
-				map.put("CheckOkUp",param.getCheckOkUp().equals("false")?false:true);
-				map.put("CheckOkDown",param.getCheckOkDown().equals("false")?false:true);
+				map.put("CheckValidUp",param.getCheckValidUp().equals("否")?false:true);
+				map.put("CheckValidDown",param.getCheckValidDown().equals("否")?false:true);
+				map.put("CheckOkUp",param.getCheckOkUp().equals("否")?false:true);
+				map.put("CheckOkDown",param.getCheckOkDown().equals("否")?false:true);
 				map.put("Precision",param.getPrecision()!=null?param.getPrecision():0);
 				inputItem.setDataJson(JSONObject.toJSONString(map));
 			}

amos-boot-system-equip/src/main/java/com/yeejoin/AmostEquipApplication.java

@@ -74,6 +74,11 @@ public class AmostEquipApplication {
 	 */
 	@Bean
 	void initMqtt() throws MqttException {
-		emqKeeper.getMqttClient().subscribe("+/+/property", 1, carIotListener);
+		try {
+			emqKeeper.subscript("+/+/property", 1, carIotListener);
+		} catch (Exception e) {
+			e.printStackTrace();
+			logger.error("EMQ初始化连接失败!");
+		}
 	}
 }

amos-boot-system-equip/src/main/resources/json/nameKeyInfo.json

@@ -6,8 +6,8 @@
     "faultNameKey": "FHS_PressurePump_Fault,FHS_PressurePump_RunFault,FHS_PressurePump_OverLoadFault",
     "expire": 14400,
     "countExpire": 1209600,
-    "equipmentCode": "92010800KAL44",
-    "pipePressureEquipmentCode": "92011000T5Q44",
+    "equipmentCode": "92010800",
+    "pipePressureEquipmentCode": "92011000",
     "top": "100",
     "countRedisKey": "Count"
   }

amos-boot-system-equip/src/main/resources/mapper/EquipmentCategoryMapper.xml

@@ -573,6 +573,7 @@
           AND biz_org_code like concat(#{bizOrgCode}, '%')
           AND is_delete = '0'
           AND input_type!='1'
+         AND key_parts_type='0'
     </select>
 
     <select id="countByCustomType" resultType="int">
@@ -581,6 +582,7 @@
           AND biz_org_code like concat(#{bizOrgCode}, '%')
           AND is_delete = '0'
           AND input_type!='1'
+          AND custom_type='0'
     </select>
 
     <select id="countAll" resultType="int">

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml

@@ -1410,22 +1410,15 @@
 		WHERE es.id = #{equipmentSpecificId}
     </select>
 
-
-
-
-
-
     <delete id="deleteEquipDataBySpecificId">
-            DELETE  es, ed, esi, ves, esr, esa, esal, eard FROM
-                wl_equipment_specific es
-                LEFT JOIN wl_equipment_detail ed ON ed.id = es.equipment_detail_id
-                LEFT JOIN wl_equipment_specific_index esi ON es.id = esi.equipment_specific_id
-                LEFT JOIN wl_video_equipment_specific ves ON es.id = ves.equipment_specific_id
-                LEFT JOIN wl_equipment_specific_relation esr ON ed.id = esr.equipment_specific_id
-                LEFT JOIN wl_equipment_specific_alarm esa ON ed.id = esa.equipment_specific_id
-                LEFT JOIN wl_equipment_specific_alarm_log esal ON ed.id = esal.equipment_specific_id
-                LEFT JOIN wl_equipment_alarm_report_day eard ON ed.id = eard.equipment_specific_id
-             WHERE es.id = #{specificId}
+        DELETE FROM wl_equipment_specific WHERE id = #{specificId};
+        DELETE FROM wl_equipment_detail WHERE id = (SELECT equipment_detail_id FROM wl_equipment_specific WHERE id = #{specificId});
+        DELETE FROM wl_equipment_specific_alarm WHERE equipment_specific_id = #{specificId};
+        DELETE FROM wl_equipment_specific_alarm_log WHERE equipment_specific_id = #{specificId};
+        DELETE FROM wl_equipment_alarm_report_day WHERE equipment_specific_id = #{specificId};
+        DELETE FROM wl_equipment_specific_index WHERE equipment_specific_id = #{specificId};
+        DELETE FROM wl_video_equipment_specific WHERE equipment_specific_id = #{specificId};
+        DELETE FROM wl_equipment_specific_relation WHERE equipment_specific_id = #{specificId};
     </delete>
     <delete id="deleteEquipDataByStockDetailId">
         DELETE
@@ -1877,7 +1870,7 @@
         WHERE
         (
         0 <![CDATA[<>]]> find_in_set(`fs`.`id`, `s`.`system_id`)
-        ) limt 1
+        ) LIMIT 1
         ) AS `chargePersonName`
         FROM
         `wl_equipment_specific_index` `si`

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -3870,7 +3870,7 @@
         </sql>
     </changeSet>
 
-    <changeSet author="ltw" id="20230614-ltw-01">
+    <changeSet author="ltw" id="20230614-ltw-01" runOnChange="true">
         <preConditions onFail="MARK_RAN">
             <not>
                 <columnExists tableName="cb_organization_user" columnName="post_name"/>
@@ -3878,7 +3878,19 @@
         </preConditions>
         <comment>modify table cb_organization_user modify columns</comment>
         <sql>
-            ALTER TABLE `cb_organization_user`  MODIFY `post_name` varchar(4000) DEFAULT NULL COMMENT '岗位名称'
+            ALTER TABLE `cb_organization_user`  MODIFY `post_name` varchar(4000) DEFAULT NULL COMMENT '岗位名称';
+        </sql>
+    </changeSet>
+
+    <changeSet author="ky" id="2023-06-21-001">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="cb_org_usr" columnName="person_img"/>
+            </not>
+        </preConditions>
+        <comment>cb_org_usr add column</comment>
+        <sql>
+            alter table `cb_org_usr` add column `person_img` varchar(255) DEFAULT NULL COMMENT '人员照片'
         </sql>
     </changeSet>
 

amos-boot-system-patrol/src/main/java/com/yeejoin/amos/PatrolApplication.java

@@ -102,8 +102,8 @@ public class PatrolApplication {
     @Bean
     void initMqtt() {
         try {
-            emqKeeper.getMqttClient().subscribe(patrolTopic, 1, patrolMqttListener);
-        } catch (MqttException e) {
+            emqKeeper.subscript(patrolTopic, 1, patrolMqttListener);
+        } catch (Exception e) {
             e.printStackTrace();
             logger.error("EMQ初始化连接失败!");
         }

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

@@ -333,10 +333,10 @@
 			and a.equipment_type is not null
 		</if>
 		<if test="treeId != null and treeId != '' and treeId == '-4'">
-			and a.key_parts_type is not null
+			and a.key_parts_type ='0'
 		</if>
 		<if test="treeId != null and treeId != '' and treeId == '-5'">
-			and a.custom_type is not null
+			and a.custom_type ='0'
 		</if>
 		<if test="subCode!=null and subCode!='' and subCode!=' ' and
 		 treeId != null and treeId != '' and treeId != '-3' and treeId != '-1' and

amos-boot-utils/amos-boot-utils-message/src/main/resources/application.properties

@@ -8,3 +8,6 @@ spring.jackson.serialization.write-dates-as-timestamps=true
 
 ##代码中有部分逻辑冲突需要处理  为区分机场和电力逻辑 增加开关 若为true 则为机场逻辑 为false 则为电力逻辑
 logic=false
+
+
+logging.config=classpath:logback-${spring.profiles.active}.xml
\ No newline at end of file