Merge branch 'develop_tzs_register' of…

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

@@ -584,7 +584,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
                     alertCalled.setCity(map.get("city").toString());
                     alertCalled.setDistrict(map.get("district").toString());
                     alertCalled.setRegionCode(map.get("regionCode").toString());
-                    alertCalled.setBizOrgCode(map.get("orgCode").toString());
+                    alertCalled.setBizOrgCode(map.get("orgCode") + "");
                 }
 
 

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

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNoticeEq;
@@ -136,12 +138,12 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     ESEquipmentCategory esEquipmentCategory;
     @Autowired
     ICommonService commonService;
-
+    @Autowired
+    DataDictionaryServiceImpl iDataDictionaryService;
     @Autowired
     private CategoryOtherInfoMapper categoryOtherInfoMapper;
     @Autowired
     private SuperviseInfoMapper superviseInfoMapper;
-
     @Autowired
     private JgInstallationNoticeEqServiceImpl jgInstallationNoticeEqServiceImpl;
     @Autowired
@@ -1199,6 +1201,23 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         return object;
     }
 
+    /**
+     * 获取类型为ZC的“未注册”的字典值
+     * @return code
+     */
+    private String getRegCode(){
+        QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("type", "ZC");
+        queryWrapper.eq("name", "未注册");
+        queryWrapper.eq("is_delete", false);
+        List<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
+        if (!list.isEmpty() && list.get(0) != null) {
+            DataDictionary dictionary = list.get(0);
+            return Optional.ofNullable(dictionary).map(DataDictionary::getCode).orElse("");
+        }
+        return "";
+    }
+
     private String batchSubmitOrUpdate(LinkedHashMap equipmentClassForm,LinkedHashMap equipmentInfoForm,LinkedHashMap equipmentParamsForm) {
         Date date = new Date();
         String record = null;
@@ -1256,11 +1275,12 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         iIdxBizJgConstructionInfoService.saveOrUpdateData(constructionInfo);
 
         //注册登记
-        IdxBizJgRegisterInfo equipmentClassRegisterInfo = JSON.parseObject(JSON.toJSONString(equipmentClassForm), IdxBizJgRegisterInfo.class);
+        // IdxBizJgRegisterInfo equipmentClassRegisterInfo = JSON.parseObject(JSON.toJSONString(equipmentClassForm), IdxBizJgRegisterInfo.class);
         IdxBizJgRegisterInfo registerInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgRegisterInfo.class);
-        Bean.copyExistPropertis(equipmentClassRegisterInfo, registerInfo);
+        // Bean.copyExistPropertis(equipmentClassRegisterInfo, registerInfo);
         registerInfo.setRecord(record);
         registerInfo.setRecDate(date);
+        registerInfo.setRegisterState(this.getRegCode());
         registerInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("REGISTERINFO_SEQ")));
         this.saveOrUpdate(registerInfo);
 

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

@@ -5,8 +5,12 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
@@ -92,6 +96,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     CmWorkflowServiceImpl cmWorkflowService;
     @Autowired
     IdxBizJgSupervisionInfoMapper idxBizJgSupervisionInfoMapper;
+    @Autowired
+    DataDictionaryServiceImpl iDataDictionaryService;
 
     private static final String DEFINITION_KEY = "useRegistration";
 
@@ -174,6 +180,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         // 更新检验检测信息
 //        inspectionDetectionInfo.setInspectReport(null);
         inspectionDetectionInfoMapper.update(inspectionDetectionInfo, inspectionLambda);
+        // 更新注册登记信息表
+        LambdaQueryWrapper<JgUseRegistrationEq> jgUseRegEqWrapper = new QueryWrapper<JgUseRegistrationEq>().lambda();
+        jgUseRegEqWrapper.eq(JgUseRegistrationEq::getEquipTransferId,currentDocumentId);
+        jgUseRegEqWrapper.eq(JgUseRegistrationEq::getIsDelete, false);
+        JgUseRegistrationEq jgUseRegistrationEq = jgRelationEquipMapper.selectOne(jgUseRegEqWrapper);
+        LambdaUpdateWrapper<IdxBizJgRegisterInfo> IdxBizJgRegLambda = new UpdateWrapper<IdxBizJgRegisterInfo>().lambda();
+        IdxBizJgRegLambda.eq(IdxBizJgRegisterInfo::getRecord, jgUseRegistrationEq.getEquId()).set(IdxBizJgRegisterInfo::getRegisterState, this.getRegCode());
+        idxBizJgRegisterInfoService.update(IdxBizJgRegLambda);
         // 更新设备监管部门
         IdxBizJgSupervisionInfo idxBizJgSupervisionInfo = new IdxBizJgSupervisionInfo();
         if (map.containsKey("orgBranchCode") && !ObjectUtils.isEmpty(map.get("orgBranchCode"))) {
@@ -189,6 +203,23 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         createCode(String.valueOf(map.get("equipId")), map, useInfo.getProvinceName() + "/" + useInfo.getCityName() + "/" + useInfo.getCountyName() + useInfo.getStreetName(), jgUseRegistration);
     }
 
+    /**
+     * 获取类型为ZC的“已注册”的字典值
+     * @return code
+     */
+    private String getRegCode(){
+        QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("type", "ZC");
+        queryWrapper.eq("name", "已注册");
+        queryWrapper.eq("is_delete", false);
+        List<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
+        if (!list.isEmpty() && list.get(0) != null) {
+            DataDictionary dictionary = list.get(0);
+            return Optional.ofNullable(dictionary).map(DataDictionary::getCode).orElse("");
+        }
+        return "";
+    }
+
     public void updateHistory(JSONObject map, String equipId, String currentDocumentId, String supervisoryCode) {
         JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
         LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();

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

@@ -52,12 +52,7 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -182,6 +177,29 @@ public class EquipmentCategoryController extends BaseController {
 		tree.add(menu);
 		return ResponseHelper.buildResponse(tree);
 	}
+
+	/**
+	 * 返回设备品种树第一个节点
+	 *
+	 * @return
+	 * @throws Exception
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET", value = "装备分类列表全部数据查询", notes = "装备分类列表全部数据查询")
+	@GetMapping(value = "/firstNode")
+	public ResponseModel<Object> firstNode(@RequestParam(value = "code",required = false) String code) throws Exception {
+		if(ObjectUtils.isEmpty(code)){
+			return ResponseHelper.buildResponse(new ArrayList<>());
+		}
+		EquipmentCategory root = equipmentCategoryServiceImpl.getOne(new LambdaQueryWrapper<EquipmentCategory>().eq(EquipmentCategory::getCode, code));
+		QueryWrapper<EquipmentCategory> queryWrapper = new QueryWrapper<>();
+		queryWrapper.likeRight("code", code.replaceAll("0+$", ""));
+		Collection<EquipmentCategory> list = equipmentCategoryServiceImpl.list(queryWrapper);
+		List<Menu> menus = TreeParser.getTree(root.getId(), list, EquipmentCategory.class.getName(), "getId", 0, "getName",
+				"getParentId", null, "getCode");
+		return ResponseHelper.buildResponse(menus.get(0));
+	}
+
 	/**
 	 * 设备分类八大类
 	 *