修改bug

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

@@ -83,13 +83,24 @@ public class ControllerAop {
         // 不需要添加请求头的接口
         String[] url = new String[]{"/api/user/save/curCompany", "/jcs/command/lookHtmlText",
                 "/jcs/common/duty-person/findByDutyAreaId", "/tzs/wechatBack", "/tzs/elevator/getElevatorInfo",
-                "/openapi/bizToken/applyToken","/fire-patrol-report/download","/fire-patrol-report/allPage","/jcs/excel/export/QDSJ"};
+                "/openapi/bizToken/applyToken","/fire-patrol-report/download","/fire-patrol-report/allPage"};
         // 获取请求路径
         for (String uri : url) {
             if (request.getRequestURI().indexOf(uri) != -1) {
                 return;
             }
         }
+
+        // 因前端组件下载时不通过url请求，导致RequestContext取不到值，所以针对这个接口特殊处理
+        if (request.getRequestURI().indexOf("/jcs/excel/export/QDSJ") != -1) {
+            String appKey = request.getHeader("appKey");
+            String product = request.getHeader("product");
+            String token = request.getHeader("token");
+            RequestContext.setAppKey(appKey);
+            RequestContext.setProduct(product);
+            RequestContext.setToken(token);
+        }
+
         //TODO tyboot 框架拦截器已缓存数据
         String token = RequestContext.getToken();
 

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificAlarmLog.java

@@ -223,4 +223,7 @@ public class EquipmentSpecificAlarmLog extends BaseEntity {
     @ApiModelProperty(value = "是否是缺陷提交确认", notes = "是否是缺陷提交确认")
     @TableField(exist = false)
     private boolean addDefect;
+
+    @TableField(value = "defect_batch_id")
+    private String defectBatchId;
 }

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

@@ -5,7 +5,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarmLog;
 import com.yeejoin.equipmanage.common.entity.MonitorEvent;
+import com.yeejoin.equipmanage.common.entity.publics.CommonResponse;
 import com.yeejoin.equipmanage.common.entity.vo.IdxBizDefectVo;
+import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
 import com.yeejoin.equipmanage.fegin.IdxFeign;
 import com.yeejoin.equipmanage.mapper.EquipmentSpecificAlarmLogMapper;
 import com.yeejoin.equipmanage.service.IConfirmAlarmService;
@@ -52,10 +54,10 @@ public class ConfirmAlarmController extends AbstractBaseController {
     @PostMapping(value = "/confirmAlam")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "保存")
-    public void confirmAlam(@RequestBody EquipmentSpecificAlarmLog ent) {
+    public ResponseModel confirmAlam(@RequestBody EquipmentSpecificAlarmLog ent) {
         String appKey = getAppKey();
         String product = getProduct();
-        iConfirmAlarmService.confirmAlam(ent, appKey, product, getToken(), getUserId());
+        return CommonResponseUtil.success(iConfirmAlarmService.confirmAlam(ent, appKey, product, getToken(), getUserId()));
     }
 
     @PostMapping(value = "/addConfirmAlam")
@@ -64,7 +66,6 @@ public class ConfirmAlarmController extends AbstractBaseController {
     public void addConfirmAlam(@RequestBody EquipmentSpecificAlarmLog ent) {
         String appKey = getAppKey();
         String product = getProduct();
-        String token = getToken();
         iConfirmAlarmService.confirmAlam(ent, appKey, product, getToken(), getUserId());
     }
 
@@ -110,7 +111,7 @@ public class ConfirmAlarmController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "缺陷处理状态")
     public IdxBizDefectVo getDefectStatus(@PathVariable String id) {
-        ResponseModel<JSONObject> responseModel = idxFeign.queryDefectByAlarmLogId(id);
+        ResponseModel<JSONObject> responseModel = idxFeign.queryDefectByBatchId(id);
         JSONObject result = responseModel.getResult();
         IdxBizDefectVo vo = JSON.parseObject(JSON.toJSONString(result), IdxBizDefectVo.class);
         return vo;

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/fegin/IdxFeign.java

@@ -25,6 +25,6 @@ public interface IdxFeign {
      * @Date 2022/9/27 17:46
      */
     @RequestMapping(value = "/defect/alarm/{alarmLogId}", method = RequestMethod.GET)
-    ResponseModel<JSONObject> queryDefectByAlarmLogId(@PathVariable String alarmLogId);
+    ResponseModel<JSONObject> queryDefectByBatchId(@PathVariable String alarmLogId);
 
 }

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

@@ -18,7 +18,7 @@ public interface IConfirmAlarmService extends IService<EquipmentSpecificAlarm> {
     Map<String ,Object> getDetailsById( Long alamId,  Long equipId , String type, String area);
 
 
-    void confirmAlam(EquipmentSpecificAlarmLog ent, String appKey, String product, String token, String userId);
+    String confirmAlam(EquipmentSpecificAlarmLog ent, String appKey, String product, String token, String userId);
 
     /**
      * 未处理消防告警

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

@@ -164,7 +164,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void confirmAlam(EquipmentSpecificAlarmLog ent, String appKey, String product, String token, String userId) {
+    public String confirmAlam(EquipmentSpecificAlarmLog ent, String appKey, String product, String token, String userId) {
         try {
             AgencyUserModel userModel = remoteSecurityService.getAgencyUser();
             ent.setConfirmUser(userModel.getUserId());
@@ -211,34 +211,23 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
             ent.setConfirmDate(new Date());
             int i = 0 ;
             ent.setConfirmTypeName(ConfirmAlamEnum.getTypeByCode(ent.getConfirmType()));
-            if (!ent.isAddDefect()) {
-                if (ent.getIsBatch() == 0){
-                    i = equipmentSpecificAlarmLogMapper.updateById(ent);
-                }else {
-                    LambdaUpdateWrapper<EquipmentSpecificAlarmLog> updateWrapper = new LambdaUpdateWrapper<EquipmentSpecificAlarmLog>().
-                            eq(EquipmentSpecificAlarmLog::getEquipmentSpecificId,ent.getEquipmentSpecificId()).
-                            eq(EquipmentSpecificAlarmLog::getEquipmentSpecificIndexKey,ent.getEquipmentSpecificIndexKey())
-                            .isNull(EquipmentSpecificAlarmLog::getConfirmDate);
-                    i = equipmentSpecificAlarmLogMapper.update(ent, updateWrapper);
-                }
+            Date date = new Date();
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            String dateString = formatter.format(date);
+            ent.setDefectBatchId(UUID.randomUUID().toString().replace("-", "").toLowerCase());
+            if (ent.isAddDefect()) {
+                ent.setResolveResult(dateString + " " + userModel.getRealName() + " 添加为缺陷进行消缺。");
             } else {
-                // 自动确警处理
-                EquipmentSpecific specific = equipmentSpecificMapper.selectById(ent.getEquipmentSpecificId());
-                Date date = new Date();
-                SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                String dateString = formatter.format(date);
-                ent.setTraceId(null);
-                String equipmentName = StringUtil.isNotEmpty(specific.getCode()) ? specific.getName() + "(" + specific.getCode() + ")" : specific.getName();
-                if (ent.getConfirmType().equals(AlarmTypeEnum.PB.getCode())) {
-                    ent.setAlarmReason(equipmentName + "频繁故障/误报，将设备报警信息屏蔽。");
-                } else {
-                    ent.setAlarmReason(equipmentName + "引起设备报警");
-                }
-                ent.setResolveResult(dateString + "系统收到设备复归（已消除）信号，系统自动处理。");
-                ent.setConfirmUser("");
-                ent.setConfirmUserName("系统自动处理");
-                ent.setConfirmDate(date);
-                equipmentSpecificAlarmLogService.updateById(ent);
+                ent.setResolveResult(dateString + " " + userModel.getRealName() + " 进行警情确认处理。");
+            }
+            if (ent.getIsBatch() == 0){
+                i = equipmentSpecificAlarmLogMapper.updateById(ent);
+            } else {
+                LambdaUpdateWrapper<EquipmentSpecificAlarmLog> updateWrapper = new LambdaUpdateWrapper<EquipmentSpecificAlarmLog>().
+                        eq(EquipmentSpecificAlarmLog::getEquipmentSpecificId,ent.getEquipmentSpecificId()).
+                        eq(EquipmentSpecificAlarmLog::getEquipmentSpecificIndexKey,ent.getEquipmentSpecificIndexKey())
+                        .isNull(EquipmentSpecificAlarmLog::getConfirmDate);
+                i = equipmentSpecificAlarmLogMapper.update(ent, updateWrapper);
             }
 
             //int i = confirmAlarmMapper.confirmAlam(ent);
@@ -283,6 +272,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
                     mqttSendGateway.sendToMqtt(TopicEnum.ALARM_LOG_INSERT.getTopic(), jsonObject.toString());
                 }
             });
+            return ent.getDefectBatchId();
         } catch (Exception e) {
             e.printStackTrace();
             throw new BadRequest("确认失败");

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

@@ -29,7 +29,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.security.core.parameters.P;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionSynchronization;
@@ -38,18 +37,14 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
-import java.lang.reflect.Array;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
-//import net.sf.json.JSONObject;
 
 /**
  * @author keyong
@@ -606,9 +601,26 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         queryWrapper.eq(EquipmentSpecificAlarmLog::getEquipmentSpecificIndexKey, equipmentSpecificIndexKey);
         queryWrapper.ne(EquipmentSpecificAlarmLog::getStatus, AlarmStatusEnum.HF.getCode());
         List<EquipmentSpecificAlarmLog> logs = equipmentSpecificAlarmLogService.getBaseMapper().selectList(queryWrapper);
+        EquipmentSpecificAlarmLog log = logs.get(0);
+        EquipmentSpecific specific = equipmentSpecificMapper.selectById(log.getEquipmentSpecificId());
+        Date date = new Date();
         logs.forEach(x -> {
             x.setCleanTime(new Date());
             x.setStatus(AlarmStatusEnum.HF.getCode());
+            if (!flag) {
+                x.setConfirmType(x.getType());
+                x.setConfirmTypeName(ConfirmAlamEnum.getTypeByCode(x.getType()));
+                String equipmentName = StringUtil.isNotEmpty(specific.getCode()) ? specific.getName() + "(" + specific.getCode() + ")" : specific.getName();
+                if (x.getType().equals(AlarmTypeEnum.PB.getCode())) {
+                    x.setAlarmReason(equipmentName + "频繁故障/误报，将设备报警信息屏蔽。");
+                } else {
+                    x.setAlarmReason(equipmentName + "引起设备报警");
+                }
+                x.setResolveResult(date + "系统收到设备复归（已消除）信号，系统自动处理。");
+                x.setConfirmUser("");
+                x.setConfirmUserName("系统自动处理");
+                x.setConfirmDate(date);
+            }
             x.setEquipmentSpecificIndexValue(TrueOrFalseEnum.fake.value);
             if (!StringUtils.isEmpty(traceId)) {
                 x.setTraceId(traceId);

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

@@ -326,13 +326,16 @@ public class ExcelServiceImpl {
 			SignDto dto = new SignDto();
 			if(par!=null && par.size()>0) {
 				String date =par.containsKey("date")?par.get("date").toString():null;
-				String bizOrgCode =par.containsKey("bizOrgCode")?par.get("bizOrgCode").toString():null;
+//				String bizOrgCode =par.containsKey("bizOrgCode")?par.get("bizOrgCode").toString():null;
 				String bizOrgName =par.containsKey("bizOrgName")?par.get("bizOrgName").toString():null;
 				String name =par.containsKey("name")?par.get("name").toString():null;
 				String type =par.containsKey("type")?par.get("type").toString():null;
 				String signTimeBIGGER =par.containsKey("signTimeBIGGER")?par.get("signTimeBIGGER").toString():null;
 				String signTimeLESS =par.containsKey("signTimeLESS")?par.get("signTimeLESS").toString():null;
-				dto.setBizOrgCode(bizOrgCode);
+				ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+				String companyId = reginParams.getPersonIdentity().getCompanyId();
+				OrgUsr orgUsr = orgUsrMapper.queryBySequenceNbr(companyId);
+				dto.setBizOrgCode(orgUsr.getBizOrgCode());
 				dto.setDate(date);
 				dto.setBizOrgName(bizOrgName);
 				dto.setName(name);

amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml

@@ -273,7 +273,7 @@
             REPLACE INTO `wl_form_group`(`id`, `group_name`, `group_code`, `group_type`, `allow_operation`, `creator_id`, `create_date`) VALUES (132828674827, '消防水池装置', '92010700', 'equip', 'edit,delete', 2581805, '2022-10-09 03:36:44');
         </sql>
     </changeSet>
-    <changeSet author="keyong" id="202210131888">
+    <changeSet author="keyong" id="202210131888-1">
         <preConditions onFail="MARK_RAN">
             <tableExists tableName="wl_equipment"/>
         </preConditions>
@@ -282,4 +282,15 @@
             REPLACE INTO `wl_equipment`(`id`, `name`, `code`, `category_id`, `country`, `maintenance_cycle`, `check_cycle`, `remark`, `management_style`, `reviser_id`, `date_updated`, `creater_id`, `unit_id`, `made_in`, `manufacturer`, `img`, `video`, `mark_specification`, `supplier_id`, `pref_quota`, `create_date`, `company_name`, `department_orgcode`, `department_name`, `inspection_spec`, `maintenance_spec`, `area`, `is_iot`, `clean_type`, `expiry_date`) VALUES (1578945741864742914, '消防水箱', '93060600HQK44', 1547790305762250754, NULL, NULL, NULL, NULL, NULL, NULL, '2022-10-09 11:10:28', NULL, 55, NULL, NULL, 'upload/state_grid/studio_normalapp_3056965/D0D194CE38EA9F604B401F1BFCC31975.jpg', NULL, NULL, NULL, NULL, '2022-10-09 11:09:35', NULL, NULL, NULL, NULL, NULL, NULL, '1', '0', NULL);
         </sql>
     </changeSet>
+    <changeSet author="keyong" id="202210131888-2">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_equipment_specific_alarm_log" columnName="defect_batch_id"/>
+            </not>
+        </preConditions>
+        <comment>新增属性字段 defect_batch_id</comment>
+        <sql>
+            alter table `wl_equipment_specific_alarm_log` add column `defect_batch_id` varchar(64) DEFAULT NULL COMMENT '缺陷表批次号';
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

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

@@ -51,7 +51,8 @@
 			confirm_date,
 			(SELECT GROUP_CONCAT(fem.name) FROM `f_fire_fighting_system` fem WHERE find_in_set(fem.id,spe.system_id)) as systemName,
 			if(ala.clean_time is null, '未消除', '已消除') AS cleanStatus,
-			ala.clean_time
+			ala.clean_time,
+			ala.defect_batch_id
         from
             wl_equipment_specific_alarm_log as ala
         left join wl_equipment_specific as spe on spe.id = ala.equipment_specific_id