Merge remote-tracking branch 'origin/dev_upgrade' into dev_upgrade

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/ContingencyAction.java

@@ -146,6 +146,9 @@ public class ContingencyAction implements CustomerAction {
     @Value("${plan.default.roleCode}")
     private String defaultRoleCode;
 
+    @Value("${plan.web.isUpdatePlanStep}")
+    private Boolean isUpdatePlanStep;
+
     private static Map<String, String> OPERATE_RECORD_ID = new HashMap<>();
 
     private static Map<String, Map<String, String>> stringStringMap = new HashMap<>();
@@ -468,19 +471,21 @@ public class ContingencyAction implements CustomerAction {
             result.add(tempmap1);
             this.sendcmd("optionarea", paramObj, result);
 
-            try {
-                System.out.println("======optionarea 加入队列参数信息======action=====");
-
-                ButtonJsonVO buttonJsonVO = JSONObject.parseObject(buttonJson, ButtonJsonVO.class);
-                Map<String, Object> map = buttonJsonVO.getOperate().get(buttonJsonVO.getOperate().size() - 1);
-                System.out.println("batchNo-->" + batchNo);
-                System.out.println("stepCode-->" + stepCode);
-                System.out.println("stepCodeNew-->" + buttonJsonVO.getStepCode());
-                System.out.println("contingencyPlanId-->" + contingencyPlanId);
-                System.out.println("buttonCode-->" + map.get("code").toString());
-                iContingencyInstance.fire(batchNo, buttonJsonVO.getStepCode(), contingencyPlanId, map.get("code").toString(), "CANCEL_0", "A", "false", RequestContext.getToken(), RequestContext.getProduct(), RequestContext.getAppKey());
-            } catch (Exception e) {
-                log.error("optionarea 加入队列失败-->" + e.getMessage());
+            if (!isUpdatePlanStep) {
+                try {
+                    System.out.println("======optionarea 加入队列参数信息======action=====");
+
+                    ButtonJsonVO buttonJsonVO = JSONObject.parseObject(buttonJson, ButtonJsonVO.class);
+                    Map<String, Object> map = buttonJsonVO.getOperate().get(buttonJsonVO.getOperate().size() - 1);
+                    System.out.println("batchNo-->" + batchNo);
+                    System.out.println("stepCode-->" + stepCode);
+                    System.out.println("stepCodeNew-->" + buttonJsonVO.getStepCode());
+                    System.out.println("contingencyPlanId-->" + contingencyPlanId);
+                    System.out.println("buttonCode-->" + map.get("code").toString());
+                    iContingencyInstance.fire(batchNo, buttonJsonVO.getStepCode(), contingencyPlanId, map.get("code").toString(), "CANCEL_0", "A", "false", RequestContext.getToken(), RequestContext.getProduct(), RequestContext.getAppKey());
+                } catch (Exception e) {
+                    log.error("optionarea 加入队列失败-->" + e.getMessage());
+                }
             }
 
             MessageVO messageVO = new MessageVO();

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/EquipmentController.java

@@ -5,6 +5,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
+import com.yeejoin.amos.component.robot.BadRequest;
 import com.yeejoin.amos.fas.business.util.ExcelUtils;
 import com.yeejoin.amos.fas.core.util.*;
 import com.yeejoin.amos.fas.dao.entity.EquipmentExcelData;
@@ -351,6 +352,9 @@ public class EquipmentController extends BaseController {
     @ApiOperation(httpMethod = "POST", value = "导入", notes = "导入")
     public Object uploadList(MultipartFile file) {
         List<EquipmentExcelData> list = ExcelUtils.importExcel(file, 1, 1, EquipmentExcelData.class);
+        if (list.isEmpty()) {
+            throw new BadRequest("导入模板不正确或导入内容为空");
+        }
         iEquipService.uploadList(list, getOrgCode(getSelectedOrgInfo()));
         return CommonResponseUtil.success();
     }

YeeAmosFireAutoSysStart/src/main/resources/application-dev.properties

 #DB properties:
-spring.datasource.url = jdbc:mysql://172.16.11.201:3306/dl_business_v3.0.1.3?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.datasource.url = jdbc:mysql://172.16.11.201:3307/dl_business_v3.0.1.3?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.datasource.username=root
 spring.datasource.password=Yeejoin@2020
 spring.datasource.driver-class-name = com.mysql.cj.jdbc.Driver
@@ -99,6 +99,9 @@ integrated3Dtype =web
 #数据同步开关
 systemctl.sync.switch=false
 
+#数字化应急预案V1.0.0.2版本，WEB数据组装，值为true，默认false
+plan.web.isUpdatePlanStep=false
+
 #地图动作区域展示
 maparea.action.is-area=action1-2,action1-6
 

YeeAmosFireAutoSysStart/src/main/resources/db/changelog/fas-2.0.1.xml

@@ -821,4 +821,37 @@
                 MODIFY COLUMN `update_date` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) AFTER `create_user`;
         </sql>
     </changeSet>
+    <changeSet author="gaojianqiang" id="20221216-01">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="cb_org_usr" columnName="personImg"/>
+            </not>
+        </preConditions>
+        <comment>cb_org_usr add column personImg</comment>
+        <sql>
+            alter table `cb_org_usr` add column `personImg` text CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT '人员照片';
+        </sql>
+    </changeSet>
+    <changeSet author="gaojianqiang" id="20221216-02">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="cb_org_usr" columnName="job_title"/>
+            </not>
+        </preConditions>
+        <comment>cb_org_usr add column job_title</comment>
+        <sql>
+            alter table `cb_org_usr` add column job_title text CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '岗位名称';
+        </sql>
+    </changeSet>
+    <changeSet author="gaojianqiang" id="20221216-03">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="cb_org_usr" columnName="telephone"/>
+            </not>
+        </preConditions>
+        <comment>cb_org_usr add column telephone</comment>
+        <sql>
+            alter table `cb_org_usr` add column `telephone` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '人员电话';
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file