优化检查项

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/mapper/InputItemMapper.java

@@ -36,4 +36,6 @@ public interface InputItemMapper {
     List<InputItemVo> getInputItemParent(@Param("id") String id);
 
     void updatePointById(Map<String, Object> param);
+
+    List<Long> getIds();
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/IPointDao.java

@@ -27,8 +27,8 @@ public interface IPointDao extends BaseDao<Point, Long> {
     
     Optional<Point> findById(Long id);
 
-    @Query(value = "SELECT id FROM p_point p WHERE p.point_no = (?1) AND p.original_id = (?2)", nativeQuery = true)
-    Long findPointByEquipmentIdAndFireFacilityId(String equipmentId, String specificId);
+    @Query(value = "SELECT id FROM p_point p WHERE p.point_no = (?1) and is_delete =0 limit 1", nativeQuery = true)
+    Long findPointByPointNoId(String id);
 
     @Modifying
     @Transactional

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PointServiceImpl.java

@@ -1162,27 +1162,28 @@ public class PointServiceImpl implements IPointService {
             }
         }
         point.setOrgCode(StringUtil.isNotEmpty(orgUsrFormDto.getAmosOrgCode()) ? orgUsrFormDto.getAmosOrgCode() : "");
-        Long pointId = iPointDao.findPointByEquipmentIdAndFireFacilityId(id, point.getOriginalId());
+        Long pointId = iPointDao.findPointByPointNoId(point.getPointNo());
         if (null != pointId) {
             ids.add(pointId);
             iPointDao.delPointBIds(pointId);
         }
         iPointDao.save(point);
-        List<InputItem> inputItemVos = inputItemMapper.getInputItemByEquipmentName(point.getName());
-        if (0 < inputItemVos.size()) {
-            inputItemVos.forEach(y -> {
+        List<Long> itemIds = inputItemMapper.getIds();
+        if (0 < itemIds.size()) {
+            itemIds.forEach(y -> {
                 PointInputItem inputItem = new PointInputItem();
                 inputItem.setPointId(point.getId());
-                inputItem.setOrderNo(y.getOrderNo());
-                inputItem.setInputItemId(y.getId());
+                inputItem.setInputItemId(y);
                 inputItems.add(inputItem);
             });
         }
         if (0 < ids.size()) {
             iPointInputItemDao.deleteByPointId(ids);
         }
+        if (0 < inputItems.size()) {
             iPointInputItemDao.saveAll(inputItems);
         }
+    }
 
     @Override
     public Page<PointDto> queryPointInfoWithItem(List<DaoCriteria> criterias, CommonPageable cPageable, Long ownerId) {

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

@@ -296,4 +296,13 @@
 	<update id="updatePointById" parameterType="map">
 		update p_input_item SET item_start = #{itemStart} WHERE id = #{id}
 	</update>
+
+	<select id="getIds" resultType="long">
+		SELECT
+			pii.id AS id
+		FROM
+			p_input_item
+		WHERE
+			is_delete = 0
+	</select>
 </mapper>
\ No newline at end of file