修改bug

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

@@ -12,10 +12,7 @@ import com.yeejoin.equipmanage.common.vo.EquipmentVo;
 import com.yeejoin.equipmanage.fegin.PatrolFeign;
 import com.yeejoin.equipmanage.mapper.*;
 import com.yeejoin.equipmanage.remote.RemoteSecurityService;
-import com.yeejoin.equipmanage.service.IEquipmentDetailService;
-import com.yeejoin.equipmanage.service.IEquipmentIndexService;
-import com.yeejoin.equipmanage.service.IEquipmentService;
-import com.yeejoin.equipmanage.service.IUnitService;
+import com.yeejoin.equipmanage.service.*;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -211,9 +208,9 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
         Map<String, Object> columnMap = new HashMap<String, Object>();
         columnMap.put("equipment_id", equipment1.getId());
         List<EquipmentDetail> equipmentDetails = equipmentDetailMapper.selectByMap(columnMap);
-//        List<Car> cars = carMapper.selectByMap(columnMap);
+        List<Car> cars = carMapper.selectByMap(columnMap);
         Equipment nowEquipment = this.baseMapper.selectById(equipment1.getId());
-        if (!(equipment1.getCategoryId()).equals(nowEquipment.getCategoryId())) {
+        if (!(equipment1.getCategoryId()).equals(nowEquipment.getCategoryId()) && (!equipmentDetails.isEmpty() || !cars.isEmpty())) {
             throw new IllegalArgumentException("此装备已被使用，不能修改分类类型");
         } else {
             nameDuplicate(equipment1, true);// 名称是否重复

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

@@ -603,7 +603,11 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
 //        }
         FireFightingSystemEntity entity = baseMapper.selectById(id);
         if (entity.getSceneId() != null) {
-            FeignUtil.remoteCall(() -> Morphic.morphicSubjectClient.delete(entity.getSceneId()));
+            try {
+                FeignUtil.remoteCall(() -> Morphic.morphicSubjectClient.delete(entity.getSceneId()));
+            } catch (Exception e) {
+                throw new RuntimeException("远程调用 MORPHIC 服务的删除操作出错");
+            }
         }
         formInstanceMapper.clearSystemId(id);
         //解除装备与消防系统关系

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/service/DocLibraryService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import com.yeejoin.amos.knowledgebase.face.enumeration.DynamicsFunctional;
 import com.yeejoin.amos.knowledgebase.face.enumeration.KnowledgeRoleName;
@@ -47,7 +48,11 @@ import org.typroject.tyboot.core.restful.exception.instance.RequestForbidden;
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.text.ParseException;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAccessor;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static com.yeejoin.amos.knowledgebase.face.util.DataTransformator.htmlContent2Text;
 import static com.yeejoin.amos.knowledgebase.face.util.FileExporter.FileType.getInstance;
@@ -165,6 +170,11 @@ public class DocLibraryService {
         page.setTotal(total);
         if (total > 0 && total > offset) {
             List<Map<String, Object>> list = docContentService.getBaseMapper().queryDocBaseInfoList(paramsMap);
+            list.stream().map(x -> {
+                x.put("createTime", x.get("createTime").toString().replace("T", " "));
+                x.put("recDate", x.get("recDate").toString().replace("T", " "));
+                return x;
+            }).collect(Collectors.toList());
             page.setRecords(list);
         }
         return page;

amos-boot-system-equip/src/main/resources/changelog/init/view_all.sql

@@ -672,10 +672,7 @@ SELECT
     IF
 	( `sal`.`clean_time` IS NOT NULL, '已消除', '未消除' ) `cleanStatus`,
 	`sal`.`iot_code` AS `iotCode`,
-	date_format(
-		`sal`.`create_date`,
-		'%m-%d %H:%i:%s'
-	) AS `createDate`,
+	`sal`.`create_date` AS `createDate`,
 	(
 		SELECT
 			GROUP_CONCAT(id)

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

@@ -1256,7 +1256,7 @@
         xhsanhj,
         xhsangz,
         xhsanpb,
-        (xhsan - xhsanhj- xhsangz-xhsanpb) as xhszc,
+        ABS(xhsan - xhsanhj- xhsangz-xhsanpb) as xhszc,
         xhsan
         from
         (select
@@ -1343,7 +1343,7 @@
         `wl_equipment_specific_index` si,
         `wl_equipment_specific` s
         where
-        si.equipment_index_key = 'FHS_FirePump_FeedbackModuleShield'
+        si.equipment_index_key = 'FHS_FirePump_RunShield'
         and si.`value` = 'true'
         and si.equipment_specific_id = s.id ) as xfsbpb,
         (SELECT