Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/ESEquipmentCategoryDto.java

@@ -167,4 +167,10 @@ public class ESEquipmentCategoryDto {
     @Field(type = FieldType.Keyword)
     private String PROJECT_CONTRAPTION;
 
+    /**
+     * 信息化
+     */
+    @Field(type = FieldType.Text)
+    private String INFORMATION_SITUATION;
+
 }

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

@@ -3049,6 +3049,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             esEquipmentDto.setEQU_DEFINE_CODE(equipInfoDto.getEquDefineCode());
             esEquipmentDto.setSUPERVISORY_CODE(otherInfo.getSupervisoryCode());
             esEquipmentDto.setEQU_DEFINE(equipInfoDto.getEquDefine());
+            esEquipmentDto.setINFORMATION_SITUATION(otherInfo.getInformationSituation());
             esEquipmentDto.setSTATUS("已认领");
 
             // 使用单位信息

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/InformationManageTypeEnum.java

+package com.yeejoin.amos.boot.module.statistics.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.*;
+
+@AllArgsConstructor
+@Getter
+public enum InformationManageTypeEnum {
+    /**
+     * 信息化管理情况枚举
+     */
+    TYPE_QR_CODE("1", "二维码"),
+    TYPE_STAMP("2", "电子标签"),
+    TYPE_NO("99", "无");
+
+    private String code;
+
+    private String name;
+
+    public static String getName(String code) {
+        Optional<String> op = Arrays.stream(InformationManageTypeEnum.values()).filter(e -> e.getCode().equals(code)).map(InformationManageTypeEnum::getName).findFirst();
+        return op.orElse("");
+    }
+
+    public static List<Map<String, Object>> getEnumList() {
+        List<Map<String, Object>> list = new ArrayList<>();
+        for (InformationManageTypeEnum testEnum : EnumSet.allOf(InformationManageTypeEnum.class)) {
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("name", testEnum.name);
+            map.put("code", testEnum.code);
+            list.add(map);
+        }
+        return list;
+    }
+
+
+}

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/ZLDPStatisticsController.java

@@ -126,12 +126,19 @@ public class ZLDPStatisticsController {
 
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/updateEquipInfo")
-    @ApiOperation(httpMethod = "POST", value = "更新es设备信息化字段", notes = "更新es设备信息化字段")
+    @GetMapping(value = "/updateEquipInfo")
+    @ApiOperation(httpMethod = "GET", value = "更新es设备信息化字段", notes = "更新es设备信息化字段")
     public ResponseModel<Object> updateEquipInfo() {
         return ResponseHelper.buildResponse(statisticsService.updateEquipInfo());
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "获取信息化下拉接口", notes = "获取信息化下拉接口")
+    @GetMapping(value = "/getInformationManageType")
+    public ResponseModel<List<Map<String, Object>>> getInformationManageType() {
+        return ResponseHelper.buildResponse(statisticsService.getInformationManageType());
+    }
+
     /**
      * 根据设备种类code获取设备类别下拉
      *

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

@@ -14,6 +14,7 @@ import com.yeejoin.amos.boot.module.common.api.entity.AlertStatistics;
 import com.yeejoin.amos.boot.module.common.api.enums.UnitTypeEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.UserPostEnum;
 import com.yeejoin.amos.boot.module.statistcs.biz.utils.JsonUtils;
+import com.yeejoin.amos.boot.module.statistics.api.enums.InformationManageTypeEnum;
 import com.yeejoin.amos.boot.module.statistics.api.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.AlertStatisticsMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.ZLStatisticsMapper;
@@ -79,6 +80,8 @@ public class ZLDPStatisticsServiceImpl {
 
     // 设备纳管  纳管：true 未纳管：false
     public static final String IS_INTO_MANAGEMENT = "IS_INTO_MANAGEMENT";
+    // 信信息化管理情况:1-二维码；2-电子标签；99-无
+    public static final String INFORMATION_SITUATION = "INFORMATION_SITUATION";
 
     @Value("classpath:/json/equipCategory.json")
     private Resource equipCategory;
@@ -884,10 +887,10 @@ public class ZLDPStatisticsServiceImpl {
             boolMust.must(meBuilder);
         }
 
-        if (!ObjectUtils.isEmpty(map.getString("INFORMATION_SITUATION"))) {
+        if (!ObjectUtils.isEmpty(map.getString(INFORMATION_SITUATION))) {
             BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
-            String test = QueryParser.escape(map.getString("INFORMATION_SITUATION"));
-            meBuilder.must(QueryBuilders.matchPhraseQuery("INFORMATION_SITUATION", "*" + test + "*"));
+            String test = QueryParser.escape(map.getString(INFORMATION_SITUATION));
+            meBuilder.must(QueryBuilders.matchPhraseQuery(INFORMATION_SITUATION, "*" + test + "*"));
             boolMust.must(meBuilder);
         }
 
@@ -942,6 +945,10 @@ public class ZLDPStatisticsServiceImpl {
                     String status = EquimentEnum.getName.get(integer);
                     dto2.put(EQU_STATE, status);
                 }
+                if (!ValidationUtil.isEmpty(dto2.get(INFORMATION_SITUATION))) {
+                    String informationSituation = InformationManageTypeEnum.getName(dto2.get(INFORMATION_SITUATION).toString());
+                    dto2.put(INFORMATION_SITUATION, informationSituation);
+                }
                 list.add(dto2);
             }
             totle = response.getInternalResponse().hits().getTotalHits().value;
@@ -1115,7 +1122,7 @@ public class ZLDPStatisticsServiceImpl {
             if (idxBizJgOtherInfoPage.getTotal() > 0) {
                 idxBizJgOtherInfoPage.getRecords().forEach(e->{
                     Map<String,Object> map = new HashMap<>();
-                    map.put("INFORMATION_SITUATION", e.getInformationSituation());
+                    map.put(INFORMATION_SITUATION, e.getInformationSituation());
                     updataMap.put(e.getRecord(), map);
                 });
             }
@@ -1123,4 +1130,8 @@ public class ZLDPStatisticsServiceImpl {
         }
         return "信息化字段更新完成";
     }
+
+    public List<Map<String, Object>> getInformationManageType() {
+        return InformationManageTypeEnum.getEnumList();
+    }
 }

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-api/src/main/java/com/yeejoin/amos/boot/module/ys/api/dto/YsEmergencyUnitDto.java

 package com.yeejoin.amos.boot.module.ys.api.dto;
 
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
@@ -64,7 +65,7 @@ public class YsEmergencyUnitDto  extends BaseDto {
     private String phone;
 
     @ApiModelProperty(value = "单位图片")
-    private String picture;
+    private JSONArray picture;
 
     @ApiModelProperty(value = "类型")
     private String type;

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-api/src/main/java/com/yeejoin/amos/boot/module/ys/api/entity/YsEmergencyUnit.java

@@ -44,7 +44,7 @@ public class YsEmergencyUnit extends BaseEntity {
     /**
      * 经纬度
      */
-	@TableField("longitudeLatitude")
+	@TableField("longitude_latitude")
     private String longitudeLatitude;
 
     /**

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-api/src/main/java/com/yeejoin/amos/boot/module/ys/api/service/IYsEmergencyUnitService.java

 package com.yeejoin.amos.boot.module.ys.api.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.ys.api.dto.YsEmergencyUnitDto;
+import com.yeejoin.amos.boot.module.ys.api.entity.YsEmergencyUnit;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+
 /**
  * 应急联动单位管理接口类
  *
- * @author system_generator
+ * @author system_generator chang xiangyu
  * @date 2024-09-24
  */
-public interface IYsEmergencyUnitService {}
+public interface IYsEmergencyUnitService {
+
+    Boolean saveOrUpdate(YsEmergencyUnitDto ysEmergencyUnitDto, AgencyUserModel userModel);
+
+    Boolean deleteBySeq(String sequenceNbr);
+
+    YsEmergencyUnitDto queryBySeq(Long sequenceNbr);
+
+    YsEmergencyUnitDto querySafeUnitBySeq(Long sequenceNbr);
+
+    Page<YsEmergencyUnitDto> querySafeUnitsByPage(Page<YsEmergencyUnit> page,YsEmergencyUnitDto ysEmergencyUnitDto);
+}

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

@@ -2,8 +2,12 @@ package com.yeejoin.amos.boot.module.ys.biz.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.ys.api.dto.YsEmergencyRehearsalDto;
 import com.yeejoin.amos.boot.module.ys.api.dto.YsEmergencyUnitDto;
+import com.yeejoin.amos.boot.module.ys.api.entity.YsEmergencyUnit;
+import com.yeejoin.amos.boot.module.ys.api.service.IYsEmergencyUnitService;
 import com.yeejoin.amos.boot.module.ys.biz.service.impl.YsEmergencyUnitServiceImpl;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,8 +32,24 @@ public class YsEmergencyUnitController extends BaseController {
 
     @Autowired
     YsEmergencyUnitServiceImpl ysEmergencyUnitServiceImpl;
+	@Autowired
+	IYsEmergencyUnitService iYsEmergencyUnitService;
 
-    /**
+
+	/**
+	 * 新增或更新
+	 * @param ysEmergencyUnitDto
+	 * @return
+	 * @author chang xiangyu
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	    @PostMapping(value = "/saveOrUpdate")
+	    @ApiOperation(httpMethod = "POST", value = "新增或者更新", notes = "新增或者更新")
+	    public ResponseModel<Boolean> saveOrUpdate(@RequestBody YsEmergencyUnitDto ysEmergencyUnitDto) {
+	        AgencyUserModel userModel = getSelectedOrgInfo().getUserModel();
+	        return ResponseHelper.buildResponse(iYsEmergencyUnitService.saveOrUpdate(ysEmergencyUnitDto, userModel));
+	    }
+	/**
      * 新增
      *
      * @return
@@ -69,17 +89,42 @@ public class YsEmergencyUnitController extends BaseController {
         return ResponseHelper.buildResponse(ysEmergencyUnitServiceImpl.removeById(sequenceNbr));
     }
 
-    /**
-     * 根据sequenceNbr查询
-     *
-	 * @param sequenceNbr  主键
-     * @return
-     */
+	/**
+	 * 根据sequenceNbr删除
+	 * @param sequenceNbr 主键
+	 * @return
+	 * @author chang xiangyu
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@DeleteMapping(value = "/deleteBySeq")
+	@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+	public ResponseModel<Boolean> deleteBySeq(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
+		return ResponseHelper.buildResponse(iYsEmergencyUnitService.deleteBySeq(sequenceNbr));
+	}
+
+//    /**
+//     * 根据sequenceNbr查询
+//     *
+//	 * @param sequenceNbr  主键
+//     * @return
+//     */
+//	@TycloudOperation(ApiLevel = UserType.AGENCY)
+//	@GetMapping(value = "/{sequenceNbr}")
+//	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+//	public ResponseModel<YsEmergencyUnitDto> selectOne(@PathVariable Long sequenceNbr) {
+//	    return ResponseHelper.buildResponse(iYsEmergencyUnitService.queryBySeq(sequenceNbr));
+//	}
+
+	/**
+	 * @author chang xiangyu
+	 * @param sequenceNbr
+	 * @return
+	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
+	@GetMapping(value = "/getDetail")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
-	public ResponseModel<YsEmergencyUnitDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(ysEmergencyUnitServiceImpl.queryBySeq(sequenceNbr));
+	public ResponseModel<YsEmergencyUnitDto> selectOne( Long sequenceNbr) {
+		return ResponseHelper.buildResponse(iYsEmergencyUnitService.querySafeUnitBySeq(sequenceNbr));
 	}
 
 	/**
@@ -93,11 +138,11 @@ public class YsEmergencyUnitController extends BaseController {
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
 	public ResponseModel<Page<YsEmergencyUnitDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<YsEmergencyUnitDto> page = new Page<YsEmergencyUnitDto>();
+                    (value = "size") int size,YsEmergencyUnitDto ysEmergencyUnitDto) {
+	    Page<YsEmergencyUnit> page = new Page<YsEmergencyUnit>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-	    return ResponseHelper.buildResponse(ysEmergencyUnitServiceImpl.queryForYsEmergencyUnitPage(page));
+	    return ResponseHelper.buildResponse(iYsEmergencyUnitService.querySafeUnitsByPage(page,ysEmergencyUnitDto));
 	}
 
 	/**

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

 package com.yeejoin.amos.boot.module.ys.biz.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.ys.api.common.StringUtil;
 import com.yeejoin.amos.boot.module.ys.api.dto.YsEmergencyUnitDto;
+import com.yeejoin.amos.boot.module.ys.api.entity.YsEmergencyRehearsal;
 import com.yeejoin.amos.boot.module.ys.api.entity.YsEmergencyUnit;
 import com.yeejoin.amos.boot.module.ys.api.mapper.YsEmergencyUnitMapper;
 import com.yeejoin.amos.boot.module.ys.api.service.IYsEmergencyUnitService;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 应急联动单位管理服务实现类
@@ -17,18 +32,113 @@ import java.util.List;
  * @date 2024-09-24
  */
 @Service
-public class YsEmergencyUnitServiceImpl extends BaseService<YsEmergencyUnitDto,YsEmergencyUnit,YsEmergencyUnitMapper> implements IYsEmergencyUnitService {
+public class YsEmergencyUnitServiceImpl extends BaseService<YsEmergencyUnitDto, YsEmergencyUnit, YsEmergencyUnitMapper> implements IYsEmergencyUnitService {
     /**
      * 分页查询
      */
-    public Page<YsEmergencyUnitDto> queryForYsEmergencyUnitPage(Page<YsEmergencyUnitDto> page)   {
+    public Page<YsEmergencyUnitDto> queryForYsEmergencyUnitPage(Page<YsEmergencyUnitDto> page) {
         return this.queryForPage(page, null, false);
     }
 
     /**
      * 列表查询 示例
      */
-    public List<YsEmergencyUnitDto> queryForYsEmergencyUnitList()   {
-        return this.queryForList("" , false);
+    public List<YsEmergencyUnitDto> queryForYsEmergencyUnitList() {
+        return this.queryForList("", false);
+    }
+
+
+    //    @Override
+    //    @Transactional(rollbackFor = Exception.class)
+    //    public Boolean saveOrUpdate(YsEmergencyRehearsalDto dto, AgencyUserModel userModel) {
+    //        YsEmergencyRehearsal emergencyRehearsal = new YsEmergencyRehearsal();
+    //        if (ValidationUtil.isEmpty(dto.getSequenceNbr())) {//新增
+    //            dto.setCreateDate(new Date());
+    //            dto.setCreateUserId(userModel.getUserId());
+    //            dto.setCreateUserName(userModel.getUserName());
+    //        }
+    //        emergencyRehearsal.setRehearsalFile(JSON.toJSONString(dto.getRehearsalFile()));
+    //        BeanUtils.copyProperties(dto, emergencyRehearsal);
+    //        return this.saveOrUpdate(emergencyRehearsal);
+    //    }
+
+    /**
+     * @author chang xiangyu
+     * @param ysEmergencyUnitDto
+     * @param userModel
+     * @return
+     */
+    @Override
+    public Boolean saveOrUpdate(YsEmergencyUnitDto ysEmergencyUnitDto, AgencyUserModel userModel) {
+        YsEmergencyUnit ysEmergencyUnit = new YsEmergencyUnit();
+        //新增
+        if (ValidationUtil.isEmpty(ysEmergencyUnitDto.getSequenceNbr())) {
+            ysEmergencyUnitDto.setCreateDate(new Date());
+            ysEmergencyUnitDto.setCreateUserId(userModel.getUserId());
+            ysEmergencyUnitDto.setCreateUserName(userModel.getUserName());
+        }
+        ysEmergencyUnit.setPicture(JSON.toJSONString(ysEmergencyUnitDto.getPicture()));
+        BeanUtils.copyProperties(ysEmergencyUnitDto, ysEmergencyUnit);
+        return this.saveOrUpdate(ysEmergencyUnit);
+    }
+
+    /**
+     * @author chang xiangyu
+     * @param sequenceNbr
+     * @return
+     */
+    @Override
+    public Boolean deleteBySeq(String sequenceNbr) {
+        LambdaUpdateWrapper<YsEmergencyUnit> lambda = new UpdateWrapper<YsEmergencyUnit>().lambda();
+        lambda.eq(YsEmergencyUnit::getSequenceNbr, sequenceNbr);
+        lambda.set(YsEmergencyUnit::getIsDelete, Boolean.TRUE);
+        return this.update(lambda);
+    }
+
+    /**
+     * @author chang xiangyu
+     * @param sequenceNbr
+     * @return
+     */
+    @Override
+    public YsEmergencyUnitDto querySafeUnitBySeq(Long sequenceNbr) {
+        LambdaQueryWrapper<YsEmergencyUnit> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(YsEmergencyUnit::getSequenceNbr,sequenceNbr);
+        queryWrapper.eq(YsEmergencyUnit::getIsDelete,Boolean.FALSE);
+        YsEmergencyUnit unSafeOne = this.getOne(queryWrapper);
+        YsEmergencyUnitDto safeYsEmergencyUnitDto = new YsEmergencyUnitDto();
+        BeanUtils.copyProperties(unSafeOne,safeYsEmergencyUnitDto);
+        if(!ValidationUtil.isEmpty(unSafeOne.getPicture())){
+            safeYsEmergencyUnitDto.setPicture(JSON.parseArray(unSafeOne.getPicture()));
+        }
+        return safeYsEmergencyUnitDto;
+    }
+
+    /**
+     * @author chang xiangyu
+     * @param page
+     * @return
+     */
+    @Override
+    public Page<YsEmergencyUnitDto> querySafeUnitsByPage(Page<YsEmergencyUnit> page,YsEmergencyUnitDto ysEmergencyUnitDto) {
+        LambdaQueryWrapper<YsEmergencyUnit> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(YsEmergencyUnit::getIsDelete,Boolean.FALSE);
+        //条件查询 -> 根据名称查询
+        if(StringUtil.isNotEmpty(ysEmergencyUnitDto.getName())){
+            queryWrapper.eq(YsEmergencyUnit::getName,ysEmergencyUnitDto.getName());
+        }
+        //条件查询 -> 根据应急服务内容查询
+        if(StringUtils.isNotEmpty(ysEmergencyUnitDto.getEmergencyService())){
+            queryWrapper.eq(YsEmergencyUnit::getEmergencyService,ysEmergencyUnitDto.getEmergencyService());
+        }
+        //条件查询 -> 根据关联消防队查询
+        if(ysEmergencyUnitDto.getTeamId()!=null){
+            queryWrapper.eq(YsEmergencyUnit::getTeamId,ysEmergencyUnitDto.getTeamId());
+        }
+        this.page(page, queryWrapper);
+        //数据脱敏
+        Page<YsEmergencyUnitDto> ysEmergencyUnitDtoPage = new Page<YsEmergencyUnitDto>();
+        BeanUtils.copyProperties(page,ysEmergencyUnitDtoPage);
+        return ysEmergencyUnitDtoPage;
     }
 }
\ No newline at end of file