巡检相关bug机场同步

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/InputItem.java

@@ -6,6 +6,7 @@ import javax.persistence.Lob;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import org.hibernate.annotations.Where;
 
 
@@ -16,6 +17,7 @@ import org.hibernate.annotations.Where;
 @Table(name = "p_input_item")
 @NamedQuery(name = "InputItem.findAll", query = "SELECT c FROM InputItem c")
 @Where(clause = "is_delete=0")//表示未删除的数据
+@TableName("p_input_item")
 public class InputItem extends BasicEntity {
     private static final long serialVersionUID = 1L;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/PointInputItem.java

 package com.yeejoin.amos.patrol.dao.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.NamedQuery;
@@ -11,6 +13,7 @@ import javax.persistence.Table;
  */
 @Entity
 @Table(name="p_point_inputitem")
+@TableName("p_point_inputitem")
 @NamedQuery(name="PointInputItem.findAll", query="SELECT p FROM PointInputItem p")
 public class PointInputItem extends BasicEntity{
 	private static final long serialVersionUID = 1L;

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/RoutePointItem.java

@@ -8,6 +8,7 @@ import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonBackReference;
 
 
@@ -17,6 +18,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference;
  */
 @Entity
 @Table(name="p_route_point_item")
+@TableName("p_route_point_item")
 @NamedQuery(name="RoutePointItem.findAll", query="SELECT r FROM RoutePointItem r")
 public class RoutePointItem extends BasicEntity {
 	private static final long serialVersionUID = 1L;

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

@@ -4,6 +4,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.patrol.business.vo.PointInputItemVo;
 import com.yeejoin.amos.patrol.dao.entity.PointInputItem;
 import org.apache.ibatis.annotations.Mapper;
@@ -15,7 +16,8 @@ import com.yeejoin.amos.patrol.dao.entity.InputItem;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface InputItemMapper extends BaseMapper {
+@Mapper
+public interface InputItemMapper extends BaseMapper<InputItem> {
 
     /**
      * 新接口
@@ -62,4 +64,9 @@ public interface InputItemMapper extends BaseMapper {
     public List<PointInputItemVo> queryCustomInputItemByPointId(@Param("classifyId") String classifyId );
 
     public PointInputItemVo getInputItemByEquipmentName(@Param("equipmentName") String equipmentName );
+
+
+    void delPointInputItemById(@Param("ids") List<Long> ids);
+
+    void delRoutePointItemByItemId(@Param("ids") List<Long> ids);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/PointInputItemMapper.java

+package com.yeejoin.amos.patrol.business.dao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.patrol.dao.entity.PointInputItem;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface PointInputItemMapper extends BaseMapper<PointInputItem> {
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/RoutePointItemMapper.java

 package com.yeejoin.amos.patrol.business.dao.mapper;
 
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.patrol.dao.entity.RoutePointItem;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
-public interface RoutePointItemMapper extends BaseMapper{
+@Mapper
+public interface RoutePointItemMapper extends BaseMapper<RoutePointItem> {
 
     public void updateRoutePointItem( RoutePointItem pointItem);
 

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

@@ -134,7 +134,7 @@ public class PointServiceImpl implements IPointService {
     @Override
     public void addPointClassifyByPointId(PointClassify pointClassify) {
 
-        iPointClassifyDao.save(pointClassify);
+        iPointClassifyDao.saveAndFlush(pointClassify);
 
     }
 

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

@@ -446,4 +446,19 @@
 	<select id="getAllCategoryName" resultType="java.util.Map">
 		select code, `name` from wl_equipment_category
 	</select>
+
+	<delete id="delPointInputItemById">
+		DELETE FROM p_point_inputitem WHERE id IN
+		<foreach collection="ids" item="item" index="index" separator="," open="(" close=")">
+			#{item}
+		</foreach>
+	</delete>
+
+	<delete id="delRoutePointItemByItemId">
+		DELETE FROM p_route_point_item WHERE point_input_item_id IN
+		<foreach collection="ids" item="item" index="index" separator="," open="(" close=")">
+			#{item}
+		</foreach>
+	</delete>
+
 </mapper>
\ No newline at end of file