Commit 2a43001a authored by tianyiming's avatar tianyiming

监管码、96333码及八大类树修改

parent 248d147b
package com.yeejoin.amos.boot.module.tzs.api.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 八大类其他信息
*
*/
@Data
@Accessors(chain = true)
@TableName("idx_biz_jg_other_info")
@ApiModel(value="CategoryOtherInfo对象", description="八大类其他信息")
public class CategoryOtherInfo{
/**
*
*/
private static final long serialVersionUID = 1L;
@TableId(value = "SEQUENCE_NBR", type = IdType.ID_WORKER_STR)
@TableField("SEQUENCE_NBR")
private String sequenceNbr;
@ApiModelProperty(value = "保险机构")
@TableField("INSURANCE_ORG")
private String insuranceOrg;
@ApiModelProperty(value = "保险到期日")
@TableField("EXPIRY_DATE")
private String expiryDate;
@ApiModelProperty(value = "物联网接入标志")
@TableField("IOT_ORG")
private String iotOrg;
@ApiModelProperty(value = "物联网接入标志")
@TableField("IOT_SIGN")
private String iotSign;
@ApiModelProperty(value = "有无监控")
@TableField("IS_MONITOR")
private String isMonitor;
@ApiModelProperty(value = "96333识别码")
@TableField("CODE96333")
private String code;
@ApiModelProperty(value = "监管码")
@TableField("SUPERVISORY_CODE")
private String supervisoryCode;
@ApiModelProperty(value = "认领状态:1代表已认领,0代表待认领,2代表拒领")
@TableField("CLAIM_STATUS")
private String claimStatus;
}
package com.yeejoin.amos.boot.module.tzs.api.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.HashMap;
import java.util.Map;
@AllArgsConstructor
@Getter
public enum EquipmentCategoryEnum {
/**
**行政区划分及对应初始监管码
*/
XZQHDT("行政区划电梯","XZQHDT"),
XZQH("行政区划","XZQH"),
BLW("补零位","0"),
JGM("监管码初始码","0000001"),
CSM("96333初始码","00001");
private String name;
private String code;
public static Map<String,String> getName=new HashMap<>();
public static Map<String,String> getCode=new HashMap<>();
static {
for (EquipmentCategoryEnum e : EquipmentCategoryEnum.values()){
getName.put(e.code, e.name);
getCode.put(e.name, e.code);
}
}
}
......@@ -13,14 +13,18 @@ public enum EquipmentClassifityEnum {
/**
**设备分类
*/
锅炉("锅炉","1000"),
压力容器("压力容器","2000"),
电梯("电梯","3000"),
起重机械("起重机械","4000"),
厂内专用机动车辆("场(厂)内专用机动车辆","5000"),
大型游乐设施("大型游乐设施","6000"),
压力管道元件("压力管道元件","7000"),
压力管道("压力管道","8000");
GL("锅炉","1000"),
YLRQ("压力容器","2000"),
DT("电梯","3000"),
QZJX("起重机械","4000"),
CC("场(厂)内专用机动车辆","5000"),
YLSS("大型游乐设施","6000"),
YLGDYJ("压力管道元件","7000"),
YLGD("压力管道","8000"),
//树类型
BDLS("八大类树","eightCategory"),
//设备认领状态
SBRLZT("设备认领状态","rlzt");
private String name;
private String code;
public static Map<String,String> getName=new HashMap<>();
......
package com.yeejoin.amos.boot.module.tzs.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.tzs.api.entity.CategoryOtherInfo;
import org.apache.ibatis.annotations.Param;
/**
* 装备分类 Mapper 接口
*
* @author system_generator
* @date 2021-10-20
*/
public interface CategoryOtherInfoMapper extends BaseMapper<CategoryOtherInfo> {
int updateSupervisorCode(String supervisorCode, String code, String sequenceNbr);
CategoryOtherInfo selectSupervisorCode(@Param("supervisorCode") String supervisorCode);
CategoryOtherInfo selectElevatorCode(@Param("elevatorCode") String elevatorCode);
}
package com.yeejoin.amos.boot.module.tzs.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.tzs.api.dto.EquipmentCategoryDto;
import com.yeejoin.amos.boot.module.tzs.api.entity.EquipmentCategory;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
import java.util.Map;
/**
* 装备分类 Mapper 接口
......@@ -18,4 +20,8 @@ public interface EquipmentCategoryMapper extends BaseMapper<EquipmentCategory> {
@Select("select * from tz_equipment_category where code in('1000','2000','3000','4000','5000','6000','8000','9000')")
List<EquipmentCategoryDto> selectClassify();
Map<String, Object> getCategoryCount(@Param("code") String code);
Map<String, Object> getAdministrativeDivision(@Param("division") String division, @Param("county") String county);
}
......@@ -17,4 +17,6 @@ public interface IEquipmentCategoryService {
List<Map<String,Object>> equipTree();
Page equipClaimOverview();
int createSupervisorCode(Map<String,Object> map);
}
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.boot.module.tzs.api.mapper.CategoryOtherInfoMapper">
<select id="selectSupervisorCode" resultType="com.yeejoin.amos.boot.module.tzs.api.entity.CategoryOtherInfo">
SELECT
SUPERVISORY_CODE
FROM
idx_biz_jg_other_info oi
WHERE
SUPERVISORY_CODE LIKE CONCAT ( #{supervisorCode}, '%' )
ORDER BY
RIGHT ( SUPERVISORY_CODE, 5 ) DESC
LIMIT 1
</select>
<update id="updateSupervisorCode">
UPDATE idx_biz_jg_other_info
SET "SUPERVISORY_CODE" = #{supervisorCode}
<if test="code != null and code != ''">
, "CODE96333" = #{code}
</if>
WHERE
"SEQUENCE_NBR" = #{sequenceNbr}
</update>
<select id="selectElevatorCode" resultType="com.yeejoin.amos.boot.module.tzs.api.entity.CategoryOtherInfo">
SELECT
CODE96333
FROM
idx_biz_jg_other_info oi
WHERE
CODE96333 LIKE CONCAT ( #{elevatorCode}, '%' )
ORDER BY
RIGHT ( CODE96333, 2 ) DESC
LIMIT 1
</select>
</mapper>
......@@ -2,4 +2,41 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.boot.module.tzs.api.mapper.EquipmentCategoryMapper">
<select id="getCategoryCount" resultType="java.util.Map">
SELECT
ibrfv.relation_form_id AS SEQUENCE_NBR,
ibjsi.ORG_BRANCH_NAME AS ORG_BRANCH_NAME,
ibjui.USE_UNIT_NAME AS USE_UNIT_NAME,
ibjri.EQU_LIST AS EQU_LIST
FROM
(
(
(
(
(
amos_idx.idx_biz_record_form_view ibrfv
LEFT JOIN amos_tzs_biz.idx_biz_jg_supervision_info ibjsi ON ( ( ibrfv.records LIKE concat ( '%', ibjsi.RECORD, '%' ) ) )
)
LEFT JOIN amos_tzs_biz.idx_biz_jg_register_info ibjri ON ( ( ibrfv.records LIKE concat ( '%', ibjri.RECORD, '%' ) ) )
)
LEFT JOIN amos_tzs_biz.idx_biz_jg_use_info ibjui ON ( ( ibrfv.records LIKE concat ( '%', ibjui.RECORD, '%' ) ) )
)
LEFT JOIN amos_tzs_biz.idx_biz_jg_other_info ibjoi ON ( ( ibrfv.records LIKE concat ( '%', ibjoi.RECORD, '%' ) ) )
)
LEFT JOIN amos_tzs_biz.tz_equipment_category tec ON ( ( ibjri.EQU_CATEGORY = tec.code ) )
)
</select>
<select id="getAdministrativeDivision" resultType="java.util.Map">
SELECT
code,
type,
type_desc
FROM
cb_data_dictionary
WHERE
type= #{division}
AND extend = ${county}
</select>
</mapper>
......@@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
/**
* 装备分类
......@@ -176,4 +177,15 @@ public class EquipmentCategoryController extends BaseController {
return ResponseHelper.buildResponse(equipmentCategoryService.equipClaimOverview());
}
/**
* 生成监管码和96333码
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/createSupervisorCode")
@ApiOperation(httpMethod = "POST", value = "生成监管码和96333码", notes = "生成监管码和96333码")
public ResponseModel<Object> createSupervisorCode(@RequestBody Map<String,Object> map) {
return ResponseHelper.buildResponse(equipmentCategoryService.createSupervisorCode(map));
}
}
package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.tzs.api.dto.EquipmentCategoryDto;
import com.yeejoin.amos.boot.module.tzs.api.entity.CategoryOtherInfo;
import com.yeejoin.amos.boot.module.tzs.api.entity.EquipmentCategory;
import com.yeejoin.amos.boot.module.tzs.api.enums.EquipmentCategoryEnum;
import com.yeejoin.amos.boot.module.tzs.api.enums.EquipmentClassifityEnum;
import com.yeejoin.amos.boot.module.tzs.api.mapper.CategoryOtherInfoMapper;
import com.yeejoin.amos.boot.module.tzs.api.mapper.EquipmentCategoryMapper;
import com.yeejoin.amos.boot.module.tzs.api.service.IEquipmentCategoryService;
import com.yeejoin.amos.boot.module.tzs.biz.utils.JsonUtils;
......@@ -10,12 +15,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.Resource;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* 装备分类服务实现类
......@@ -35,6 +38,9 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
@Value("classpath:/json/equipStatus.json")
private Resource equipStatus;
@Autowired
CategoryOtherInfoMapper categoryOtherInfoMapper;
/**
* 分页查询
*/
......@@ -55,7 +61,8 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
@Override
public List<Map<String, Object>> equipTree() {
List<Map> mapList = JsonUtils.getResourceJson(equipCategory);
Map<String, List<Map<String, Object>>> resourceJson = JsonUtils.getResourceJson(equipCategory);
List<Map<String, Object>> mapList = resourceJson.get(EquipmentClassifityEnum.BDLS.getCode());
List<Map<String, Object>> menus = new ArrayList<>();
for (Map map : mapList) {
Map<String, Object> resultMap = new HashMap<>();
......@@ -69,30 +76,33 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
@Override
public Page equipClaimOverview() {
Page page = new Page<>();
List<Map> mapList = JsonUtils.getResourceJson(equipCategory);
Map<String, List<Map<String, Object>>> resourceJson = JsonUtils.getResourceJson(equipCategory);
List<Map<String, Object>> mapList = resourceJson.get(EquipmentClassifityEnum.BDLS.getCode());
List<Map<String, Object>> list = new ArrayList<>();
for (Map map : mapList) {
Map<String, Object> resultMap = new HashMap<>();
//todo sql待定,目前为假数据
// Map<String, Object> map1 = equipmentCategoryMapper.getCategoryCount(map.get("code").toString());
Map<String,Object> objectMap = new HashMap<>();
objectMap.put("waitClaim",985);
objectMap.put("alreadyClaim",18985);
objectMap.put("refuseClaim",985);
List<Map<String, Object>> list1= new ArrayList<>();
List<Map> equipStatusList = JsonUtils.getResourceJson(equipStatus);
Map<String, Object> objectMap = new HashMap<>();
objectMap.put("waitClaim", 985);
objectMap.put("alreadyClaim", 18985);
objectMap.put("refuseClaim", 985);
List<Map<String, Object>> list1 = new ArrayList<>();
Map<String, List<Map<String, Object>>> jsonMap = JsonUtils.getResourceJson(equipStatus);
List<Map<String, Object>> equipStatusList = jsonMap.get(EquipmentClassifityEnum.SBRLZT.getCode());
for (Map equipStatusMap : equipStatusList) {
Map<String, Object> map1 = new HashMap<>();
map1.put("name",equipStatusMap.get("value"));
map1.put("value",objectMap.get(equipStatusMap.get("value")));
map1.put("name", equipStatusMap.get("value"));
map1.put("value", objectMap.get(equipStatusMap.get("value")));
list1.add(map1);
}
resultMap.put("name",map.get("name"));
resultMap.put("image",map.get("image"));
resultMap.put("waitClaim",985);
resultMap.put("alreadyClaim",18985);
resultMap.put("refuseClaim",985);
resultMap.put("sum",20955);
resultMap.put("value",list1);
resultMap.put("name", map.get("name"));
resultMap.put("image", map.get("image"));
resultMap.put("waitClaim", 985);
resultMap.put("alreadyClaim", 18985);
resultMap.put("refuseClaim", 985);
resultMap.put("sum", 20955);
resultMap.put("value", list1);
list.add(resultMap);
}
page.setCurrent(1);
......@@ -101,4 +111,80 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
return page;
}
@Override
public int createSupervisorCode(Map<String, Object> map) {
LinkedHashMap value = (LinkedHashMap) map.get("value");
LinkedHashMap o = (LinkedHashMap) value.get("1627903393253056514");
String city = o.get("CITY").toString();
String county = o.get("COUNTY").toString();
LinkedHashMap o1 = (LinkedHashMap) value.get("1630483430028369922");
String equipCategory = o1.get("EQU_CATEGORY").toString();
String equipList = o1.get("EQU_LIST").toString();
//测试数据 暂时保留
// String city = "610400";
// String county = "610401";
// String equipCategory = "3200";
// String equipList = "3000";
Map<String, String> codeMap = creatCode(city, county, equipCategory, equipList);
CategoryOtherInfo otherInfo = categoryOtherInfoMapper.selectOne(new QueryWrapper<CategoryOtherInfo>().orderByDesc("REC_DATE").last("limit 1"));
return categoryOtherInfoMapper.updateSupervisorCode(codeMap.get("supervisorCode"), codeMap.get("elevatorCode"), otherInfo.getSequenceNbr());
}
//生成监管码和电梯96333识别码
private Map<String, String> creatCode(String city, String county, String equipCategory, String equipList) {
Map<String, String> resultMap = new HashMap<>();
Map<String, Object> divisionMap = equipmentCategoryMapper.getAdministrativeDivision(EquipmentCategoryEnum.XZQH.getCode(), county);
String division = ObjectUtils.isEmpty(divisionMap) ? equipmentCategoryMapper.getAdministrativeDivision(EquipmentCategoryEnum.XZQH.getCode(), city).get("code").toString() : divisionMap.get("code").toString();
StringBuilder supervisorCode = new StringBuilder();
supervisorCode.append(division).append(equipCategory);
CategoryOtherInfo supervisor = categoryOtherInfoMapper.selectSupervisorCode(supervisorCode.toString());
if (!ObjectUtils.isEmpty(supervisor)) {
if (supervisor.getSupervisoryCode() != null) {
String supervisoryCode = supervisor.getSupervisoryCode().substring(4);
long num = Long.valueOf(supervisoryCode) + 1;
int numLength = String.valueOf(num).length();
int a = 7 - numLength;
StringBuilder zero = new StringBuilder();
for (int i = 0; i < a; i++) {
zero.append(EquipmentCategoryEnum.BLW.getCode());
}
zero.append(num);
supervisorCode.append(zero);
} else {
supervisorCode.append(EquipmentCategoryEnum.JGM.getCode());
}
} else {
supervisorCode.append(EquipmentCategoryEnum.JGM.getCode());
}
StringBuilder elevatorCode = new StringBuilder();
if (EquipmentClassifityEnum.DT.getCode().equals(equipList)) {
Map<String, Object> elevatorMap = equipmentCategoryMapper.getAdministrativeDivision(EquipmentCategoryEnum.XZQHDT.getCode(), county);
String elevator = ObjectUtils.isEmpty(elevatorMap) ? equipmentCategoryMapper.getAdministrativeDivision(EquipmentCategoryEnum.XZQHDT.getCode(), city).get("code").toString() : elevatorMap.get("code").toString();
elevatorCode.append(elevator);
CategoryOtherInfo elevatorOtherInfo = categoryOtherInfoMapper.selectElevatorCode(elevatorCode.toString());
if (!ObjectUtils.isEmpty(elevatorOtherInfo)) {
if (elevatorOtherInfo.getCode() != null) {
String elevatorCode1 = elevatorOtherInfo.getCode().substring(2);
long num = Long.valueOf(elevatorCode1) + 1;
int numLength = String.valueOf(num).length();
int a = 5 - numLength;
StringBuilder zero = new StringBuilder();
for (int i = 0; i < a; i++) {
zero.append(EquipmentCategoryEnum.BLW.getCode());
}
zero.append(num);
elevatorCode.append(zero);
} else {
elevatorCode.append(EquipmentCategoryEnum.CSM.getCode());
}
} else {
elevatorCode.append(EquipmentCategoryEnum.CSM.getCode());
}
}
resultMap.put("supervisorCode", ObjectUtils.isEmpty(supervisorCode.toString()) ? null : supervisorCode.toString());
resultMap.put("elevatorCode", ObjectUtils.isEmpty(elevatorCode.toString()) ? null : elevatorCode.toString());
return resultMap;
}
}
\ No newline at end of file
......@@ -6,19 +6,18 @@ import org.springframework.core.io.Resource;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;
public class JsonUtils {
//将json文件转化为list<Map>
public static List<Map> getResourceJson(Resource resource) {
public static Map getResourceJson(Resource resource) {
String json = null;
try {
json = IOUtils.toString(resource.getInputStream(), String.valueOf(StandardCharsets.UTF_8));
} catch (IOException e) {
throw new RuntimeException(resource + "json文件转化失败");
}
return JSONObject.parseArray(json, Map.class);
return (Map)JSONObject.parseObject(json, Map.class);
}
}
[
{
"name": "电梯",
"code": "3000",
"image": "upload/tzs/common/image/总览电梯.png"
},
{
"name": "起重机械",
"code": "4000",
"image": "upload/tzs/common/image/总览电梯.png"
},
{
"name": "场内机动车辆",
"code": "5000",
"image": "upload/tzs/common/image/总览厂车.png"
},
{
"name": "锅炉",
"code": "1000",
"image": "upload/tzs/common/image/总览锅炉.png"
},
{
"name": "压力容器",
"code": "2000",
"image": "upload/tzs/common/image/总览压力容器.png"
},
{
"name": "压力管道",
"code": "8000",
"image": "upload/tzs/common/image/总览压力管道.png"
},
{
"name": "大型游乐设施",
"code": "6000",
"image": "upload/tzs/common/image/总览游乐设施.png"
},
{
"name": "客运索道",
"code": "9000",
"image": "upload/tzs/common/image/总览索道.png"
}
]
\ No newline at end of file
{
"eightCategory": [
{
"name": "电梯",
"code": "3000",
"image": "upload/tzs/common/image/总览电梯.png"
},
{
"name": "起重机械",
"code": "4000",
"image": "upload/tzs/common/image/总览起重机械.png"
},
{
"name": "场内机动车辆",
"code": "5000",
"image": "upload/tzs/common/image/总览厂车.png"
},
{
"name": "锅炉",
"code": "1000",
"image": "upload/tzs/common/image/总览锅炉.png"
},
{
"name": "压力容器",
"code": "2000",
"image": "upload/tzs/common/image/总览压力容器.png"
},
{
"name": "压力管道",
"code": "8000",
"image": "upload/tzs/common/image/总览压力管道.png"
},
{
"name": "大型游乐设施",
"code": "6000",
"image": "upload/tzs/common/image/总览游乐设施.png"
},
{
"name": "客运索道",
"code": "9000",
"image": "upload/tzs/common/image/总览索道.png"
}
]
}
\ No newline at end of file
[
{
"name": "待认领",
"value": "waitClaim"
},
{
"name": "已认领",
"value": "alreadyClaim"
},
{
"name": "拒领",
"value": "refuseClaim"
}
]
\ No newline at end of file
{
"rlzt": [
{
"name": "待认领",
"value": "waitClaim"
},
{
"name": "已认领",
"value": "alreadyClaim"
},
{
"name": "拒领",
"value": "refuseClaim"
}
]
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment