Merge branch 'develop_dl_3.7.1.0' into develop_dl

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/EquipFeignClient.java

@@ -417,7 +417,13 @@ public interface EquipFeignClient {
     @RequestMapping(value = "equipSpecific/getListByEquipmentCodeEQ/{code}", method = RequestMethod.GET)
     ResponseModel<List<Map<String, Object>>>  getListByEquipmentCodeEQ(@PathVariable("code") String code);
 
+
     @RequestMapping(value = "equipSpecific/list", method = RequestMethod.GET)
     ResponseModel<List<Map<String, Object>>>  getListByEquipmentSpesById(@RequestParam("ids") String ids, @RequestParam("type") String type);
 
+
+    @RequestMapping(value = "/scrap/delete/person", method = RequestMethod.POST)
+    ResponseModel<Object> delUsr(@RequestBody String id) throws InnerInvokException;
+
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/IdxFeignClient.java

+package com.yeejoin.amos.boot.module.common.api.feign;
+
+import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
+import com.yeejoin.amos.component.feign.config.InnerInvokException;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+/**
+ * 装备服务feign
+ *
+ * @author Dell
+ */
+@FeignClient(name = "${idx.feign.name:AMOS-IDX}", path = "idx", configuration = {MultipartSupportConfig.class})
+public interface IdxFeignClient {
+
+
+    @RequestMapping(value = "/defect/delete/person", method = RequestMethod.POST)
+    ResponseModel<Object> delUsr(@RequestBody String id) throws InnerInvokException;
+
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -26,6 +26,8 @@ import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.UserRolesEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.UserUnitTypeEnum;
 import com.yeejoin.amos.boot.module.common.api.feign.AmosTrainingFeignClient;
+import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
+import com.yeejoin.amos.boot.module.common.api.feign.IdxFeignClient;
 import com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper;
 import com.yeejoin.amos.boot.module.common.api.mapper.FireTeamMapper;
 import com.yeejoin.amos.boot.module.common.api.mapper.FirefightersJacketMapper;
@@ -174,6 +176,12 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	@Autowired
 	RedisUtils redisUtils;
 
+	@Autowired
+	EquipFeignClient equipFeignClient;
+
+	@Autowired
+	IdxFeignClient idxFeignClient;
+
 	public static List<OrgMenuDto> buildTreeParallel(List<OrgUsr> list) {
 
 		List<OrgMenuDto> menuList = list.stream()
@@ -3417,6 +3425,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			public void afterCommit() {
 				// 事物提交后业务逻辑
 				dataSyncService.OrgUsrSyncDtoDelDataSync(id);
+
+				// 由于处理消息地方没人知道，此处手动调用更新business、idx库用户数据
+				equipFeignClient.delUsr(String.valueOf(id));
+				idxFeignClient.delUsr(String.valueOf(id));
 			}
 		});
 

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

@@ -229,4 +229,16 @@ public class ScrapController extends AbstractBaseController {
 		}
 		return CommonResponseUtil.success();
 	}
+
+	@RequestMapping(value = "/delete/person", method = RequestMethod.POST)
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "POST", value = "机场人员删除接口", notes = "机场人员删除接口", produces = "application/json;charset=UTF-8")
+	public ResponseModel delPerson(@RequestBody String id) {
+		try {
+			iScrapService.delPerson(Long.valueOf(id));
+		} catch (Exception e) {
+			return CommonResponseUtil.failure("人员删除失败！");
+		}
+		return CommonResponseUtil.success();
+	}
 }

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

@@ -30,4 +30,6 @@ public interface IScrapService extends IService<Scrap> {
 	void scrapOnCar(Long id);
 
 	void scrapOnPerson(Long id);
+
+	void delPerson(Long id);
 }

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

@@ -13,12 +13,14 @@ import com.yeejoin.equipmanage.common.utils.StringUtil;
 import com.yeejoin.equipmanage.fegin.IdxFeign;
 import com.yeejoin.equipmanage.mapper.CarMapper;
 import com.yeejoin.equipmanage.mapper.EquipmentOnCarMapper;
+import com.yeejoin.equipmanage.mapper.OrgUsrMapper;
 import com.yeejoin.equipmanage.mapper.ScrapMapper;
 import com.yeejoin.equipmanage.service.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
 
 import java.math.BigDecimal;
 import java.util.*;
@@ -60,6 +62,9 @@ public class ScrapServiceImpl extends ServiceImpl<ScrapMapper, Scrap> implements
     @Autowired
     private IdxFeign idxFeign;
 
+    @Autowired
+    private OrgUsrMapper orgUsrMapper;
+
     @Override
     public Scrap create(List<ScrapDetail> list, String type, AgencyUserModel agencyUserModel) {
         this.scrapCheck(type, list);
@@ -318,4 +323,13 @@ public class ScrapServiceImpl extends ServiceImpl<ScrapMapper, Scrap> implements
         stockDetailService.updateById(stockDetail);
     }
 
+    @Override
+    public void delPerson(Long id) {
+        OrgUsr usr = orgUsrMapper.selectById(id);
+        if (!ObjectUtils.isEmpty(usr)) {
+            usr.setIsDelete(true);
+            orgUsrMapper.updateById(usr);
+        }
+    }
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java

@@ -7,6 +7,8 @@ import javax.servlet.http.HttpServletRequest;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.module.common.api.entity.*;
 import com.yeejoin.amos.boot.module.common.api.enums.ExceptionEnum;
+import com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IDynamicFormInstanceService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -101,6 +103,8 @@ public class FirefightersController extends BaseController {
     RedisUtils redisUtils;
     @Autowired
     DataDictionaryServiceImpl dataDictionaryService;
+    @Autowired
+    DynamicFormInstanceMapper dynamicFormInstanceMapper;
 
     @Value("${redis.cache.failure.time}")
     private long time;
@@ -485,6 +489,17 @@ public class FirefightersController extends BaseController {
                     }
                     iFirefightersService.updateById(firefighter);
                     ifirefightersContactsService.updateById(firefighters.getFirefightersContacts());
+
+                    QueryWrapper<DynamicFormInstance> queryWrapper = new QueryWrapper<>();
+                    queryWrapper.eq("group_code", OrgPersonEnum.人员.getCode());
+                    queryWrapper.eq("field_code", "peopleType");
+                    queryWrapper.eq("instance_id", id);
+                    DynamicFormInstance instance = dynamicFormInstanceMapper.selectOne(queryWrapper);
+                    if (!ObjectUtils.isEmpty(instance)) {
+                        instance.setFieldValue(firefighters.getFirefighters().getPeopleType());
+                        dynamicFormInstanceMapper.updateById(instance);
+                    }
+
                     // 删除缓存
                     redisUtils.del(RedisKey.FIREFIGHTERS_ID + firefighter.getSequenceNbr(),
                             RedisKey.FIREFIGHTERS_LIST_ID + firefighter.getSequenceNbr());

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

@@ -1560,7 +1560,7 @@ public class CheckServiceImpl implements ICheckService {
         List<HashMap<String,Object>>  equipList= checkMapper.getCheckEquipByCheckID(param.getCheckID());
         equipList.forEach(equip->{
             param.setClassifyId(equip.get("classifyId").toString());
-            equip.put("IsOK",PointStatusEnum.QUALIFIED.getName());
+            equip.put("IsOK", equip.get("IsOK"));
             List<HashMap<String,Object>> inputContent = checkMapper.getEquipInputByCheckId(param);
             List<HashMap<String,Object>> imgContent = checkMapper.getEquipInfoImgsByCheckIdsList(param.getCheckID());
 //            String ipPort = "http://" + fileIp + ":" + filePort + "/";

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

@@ -1261,6 +1261,13 @@
         classify.building_id as buildingId,
         classify.building_name as place,
         classify.category_code as categoryCode,
+        (SELECT CASE is_ok WHEN 1 THEN
+        '合格'
+        WHEN 2 THEN
+        '不合格'
+        WHEN 3 THEN
+        '漏检'
+        END AS IsOK FROM p_check WHERE id = #{checkID}) as IsOK,
         (SELECT create_date FROM p_check WHERE id = #{checkID}) as createDate
         FROM
         p_point_classify classify