一码通删除功能补全

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/EquipmentCategoryMapper.java

@@ -36,7 +36,7 @@ public interface EquipmentCategoryMapper extends BaseMapper<EquipmentCategory> {
 
     Map<String, Object> getCategoryAndDefineByRecord(@Param("record") String record);
 
-    List<Map<String, Object>> getAllUnit(String unitCode);
+    List<Map<String, Object>> getAllUnit(@Param("unitCodes")List<String> unitCodes);
 
     List<Map<String, Object>> getCategoryData(String level, String orgCode, String companyCode);
 

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/SuperviseInfoMapper.java

@@ -5,7 +5,6 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.SuperviseInfo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 特种设备基本信息-监督管理信息 Mapper 接口
@@ -17,7 +16,8 @@ public interface SuperviseInfoMapper extends BaseMapper<SuperviseInfo> {
 
 	void updateRecordBatch(@Param("recordList") List<String> recordList);
 
-	List<Map<String, Object>> selectUnitCodeAndSuperviseCodeList(@Param("records") List<String> records);
+	List<String> selectUnitCodeList(@Param("records") List<String> records);
+	List<String> selectSuperviseCodeList(@Param("records") List<String> records);
 
-	void deleteAll();
+	void deleteDataAll(@Param("records") List<String> records);
 }

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/resources/mapper/EquipmentCategoryMapper.xml

@@ -159,8 +159,11 @@
             USE_UNIT_CREDIT_CODE is NOT NULL
         AND USE_UNIT_CREDIT_CODE <![CDATA[ <> ]]>  ''
         AND (lengthb(USE_UNIT_CREDIT_CODE)= 15 or lengthb(USE_UNIT_CREDIT_CODE)= 18)
-        <if test="unitCode !=null and unitCode != ''">
-            and USE_UNIT_CREDIT_CODE = #{unitCode}
+        <if test="unitCodes !=null and unitCodes != ''">
+            and USE_UNIT_CREDIT_CODE in
+            <foreach collection="unitCodes" separator="," item="unitCode" open="(" close=")">
+                 #{unitCode}
+            </foreach>
         </if>
         GROUP BY use_code
         ORDER BY use_code

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/resources/mapper/SupervisionInfoMapper.xml

@@ -9,24 +9,100 @@
         </foreach>
     </update>
 
-    <select id="selectUnitCodeAndSuperviseCodeList" resultType="java.util.Map">
+    <select id="selectUnitCodeList" resultType="java.lang.String">
         SELECT
-            USE_UNIT_CREDIT_CODE unitCode,
-            SUPERVISORY_CODE code
+        DISTINCT ( USE_UNIT_CREDIT_CODE ) unitCode
         FROM
-            idx_biz_jg_use_info ui LEFT JOIN idx_biz_jg_other_info oi ON ui."RECORD" = oi."RECORD"
+            idx_biz_jg_use_info ui
         WHERE ui."RECORD" in
         <foreach collection="records" separator="," item="record" open="(" close=")">
             #{record}
         </foreach>
     </select>
 
-    <delete id="deleteAll" >
+    <select id="selectSuperviseCodeList" resultType="java.lang.String">
+        SELECT
+            SUPERVISORY_CODE code
+        FROM
+            idx_biz_jg_other_info oi
+        WHERE oi."RECORD" in
+        <foreach collection="records" separator="," item="record" open="(" close=")">
+            #{record}
+        </foreach>
+    </select>
+
+    <delete id="deleteDataAll" >
         delete from idx_biz_jg_use_info where "RECORD" in
         <foreach collection="records" separator="," item="record" open="(" close=");">
             #{record}
         </foreach>
-        delete from idx_biz_jg_other_info where "RECORD" = '102410241024';
-        delete from idx_biz_jg_register_info where "RECORD" = '102410241024';
+        delete from idx_biz_jg_design_info where "RECORD" in
+        <foreach collection="records" separator="," item="record" open="(" close=");">
+            #{record}
+        </foreach>
+        delete from idx_biz_jg_factory_info where "RECORD" in
+        <foreach collection="records" separator="," item="record" open="(" close=");">
+            #{record}
+        </foreach>
+        delete from idx_biz_jg_construction_info where "RECORD" in
+        <foreach collection="records" separator="," item="record" open="(" close=");">
+            #{record}
+        </foreach>
+        delete from idx_biz_jg_register_info where "RECORD" in
+        <foreach collection="records" separator="," item="record" open="(" close=");">
+            #{record}
+        </foreach>
+        delete from idx_biz_jg_maintenance_record_info where "RECORD" in
+        <foreach collection="records" separator="," item="record" open="(" close=");">
+            #{record}
+        </foreach>
+        delete from idx_biz_jg_other_info where "RECORD" in
+        <foreach collection="records" separator="," item="record" open="(" close=");">
+            #{record}
+        </foreach>
+        delete from idx_biz_jg_inspection_detection_info where "RECORD" in
+        <foreach collection="records" separator="," item="record" open="(" close=");">
+            #{record}
+        </foreach>
+        delete from idx_biz_jg_tech_params_elevator where "RECORD" in
+        <foreach collection="records" separator="," item="record" open="(" close=");">
+            #{record}
+        </foreach>
+        delete from idx_biz_jg_tech_params_vehicle where "RECORD" in
+        <foreach collection="records" separator="," item="record" open="(" close=");">
+            #{record}
+        </foreach>
+        delete from idx_biz_jg_tech_params_ropeway where "RECORD" in
+        <foreach collection="records" separator="," item="record" open="(" close=");">
+            #{record}
+        </foreach>
+        delete from idx_biz_jg_tech_params_rides where "RECORD" in
+        <foreach collection="records" separator="," item="record" open="(" close=");">
+            #{record}
+        </foreach>
+        delete from idx_biz_jg_tech_params_boiler where "RECORD" in
+        <foreach collection="records" separator="," item="record" open="(" close=");">
+            #{record}
+        </foreach>
+        delete from idx_biz_jg_tech_params_vessel where "RECORD" in
+        <foreach collection="records" separator="," item="record" open="(" close=");">
+            #{record}
+        </foreach>
+        delete from idx_biz_jg_tech_params_pipeline where "RECORD" in
+        <foreach collection="records" separator="," item="record" open="(" close=");">
+            #{record}
+        </foreach>
+        delete from idx_biz_jg_tech_params_lifting where "RECORD" in
+        <foreach collection="records" separator="," item="record" open="(" close=");">
+            #{record}
+        </foreach>
+        delete from idx_biz_jg_main_parts where "RECORD" in
+        <foreach collection="records" separator="," item="record" open="(" close=");">
+            #{record}
+        </foreach>
+        delete from idx_biz_jg_protection_devices where "RECORD" in
+        <foreach collection="records" separator="," item="record" open="(" close=");">
+            #{record}
+        </foreach>
     </delete>
 </mapper>
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/EquipmentCategoryController.java

@@ -255,7 +255,7 @@ public class EquipmentCategoryController extends BaseController {
 	 *
 	 * @return
 	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/deleteBatch", method = RequestMethod.POST)
 	@ApiOperation(httpMethod = "POST", value = "批量删除一码通数据", notes = "批量删除一码通数据")
 	public ResponseModel<Object> deleteBatch(@RequestBody Map<String,Object> map) {

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/EquipmentCategoryServiceImpl.java

@@ -47,6 +47,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
@@ -798,9 +799,9 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         return getCategoryData(null);
     }
 
-    private List<EquipmentCategoryData> getCategoryData(String unitCode) {
+    private List<EquipmentCategoryData> getCategoryData(List<String> unitCodes) {
         List<EquipmentCategoryData> list = new ArrayList<>();
-        List<Map<String, Object>> allUnitList = equipmentCategoryMapper.getAllUnit(unitCode);
+        List<Map<String, Object>> allUnitList = equipmentCategoryMapper.getAllUnit(unitCodes);
         for (Map<String, Object> map : allUnitList) {
             EquipmentCategoryData equipmentCategoryData = new EquipmentCategoryData();
             equipmentCategoryData.setOrgBranchCode(map.get("supervise_org_code").toString());
@@ -855,26 +856,48 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         if(ObjectUtils.isEmpty(unitCode)){
             return new EquipmentCategoryData();
         }
-        List<EquipmentCategoryData> equipmentCategoryData = getCategoryData(unitCode);
+        List<String> unitCodeList = new ArrayList<>();
+        unitCodeList.add(unitCode);
+        List<EquipmentCategoryData> equipmentCategoryData = getCategoryData(unitCodeList);
         return equipmentCategoryData.get(0);
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public List<String> deleteBatch(Map<String, Object> map) {
         Object recordList = map.get("recordList");
         List<String> records = new ArrayList<>();
+        List<ESEquipmentCategoryDto> list = new ArrayList<>();
+
         if(recordList.toString().contains(",")){
             for (String record : (List<String>) recordList) {
                 records.add(record);
+                ESEquipmentCategoryDto esEquipmentCategoryDto = new ESEquipmentCategoryDto();
+                esEquipmentCategoryDto.setSEQUENCE_NBR(record);
+                list.add(esEquipmentCategoryDto);
             }
         } else {
             records.add(recordList.toString());
-        }
-        List<Map<String,Object>> codeList = superviseInfoMapper.selectUnitCodeAndSuperviseCodeList(records);
-
-        superviseInfoMapper.deleteAll();
-
-        return null;
+            ESEquipmentCategoryDto esEquipmentCategoryDto = new ESEquipmentCategoryDto();
+            esEquipmentCategoryDto.setSEQUENCE_NBR(recordList.toString());
+            list.add(esEquipmentCategoryDto);
+        }
+        //删除监管码表数据
+        List<String> superviseCodeList = superviseInfoMapper.selectSuperviseCodeList(records);
+        if(!ObjectUtils.isEmpty(superviseCodeList)){
+            supervisoryCodeInfoMapper.delete(new QueryWrapper<SupervisoryCodeInfo>().in("supervisory_code", superviseCodeList));
+        }
+
+        //删除涉及的19张表的数据
+        superviseInfoMapper.deleteDataAll(records);
+        // 根据统一信用代码更新总览表
+        List<String> unitCodeList = superviseInfoMapper.selectUnitCodeList(records);
+        if(!ObjectUtils.isEmpty(unitCodeList)){
+            getCategoryData(unitCodeList);
+        }
+        //删除es中的数据
+        esEquipmentCategory.deleteAll(list);
+        return records;
     }