Skip to content

A
amos-boot-biz
Commit 0fd710fa authored by tianbo's avatar tianbo
Browse files
Options

企业维护增加涉及设备类型：气瓶（2300）

parent e9b39316
Show whitespace changes
Inline Side-by-side
Showing with 183 additions and 120 deletions
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/enums/EquipmentClassifityEnum.java
View file @ 0fd710fa
......@@ -26,7 +26,10 @@ public enum EquipmentClassifityEnum {
//设备认领状态
SBRLZT("设备认领状态","rlzt"),
BDLS("八大类树","eightCategory"),
RENLING("其他","other");
RENLING("其他","other"),
CYLINDER("气瓶","cylinder");
private String name;
private String code;
public static Map<String,String> getName=new HashMap<>();
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/service/IEquipmentCategoryService.java
View file @ 0fd710fa
......@@ -17,24 +17,25 @@ import java.util.Map;
*/
public interface IEquipmentCategoryService {
List<Map<String,Object>> equipTree(String type);
List<Map<String, Object>> equipTree(String type);
Page equipClaimOverview();
Map<String, String> createSupervisorCode(Map<String, Object> map, String record);
List<LinkedHashMap> getTree();
List<LinkedHashMap> creatTree();
List<LinkedHashMap> getRegion(String level, String parentId);
Map<String,Object> getCategoryAndDefineByRecord(String rowId);
Map<String, Object> getCategoryAndDefineByRecord(String rowId);
List<CategoryOtherInfo> checkCode(Map<String, Object> obj);
List<String> updateOtherInfo(Map<String, Object> map);
Map<String,Map<String,Object>> getFormRecordById(Map<String, Object> map);
Map<String, Map<String, Object>> getFormRecordById(Map<String, Object> map);
void checkEsData(String id);
......@@ -43,4 +44,9 @@ public interface IEquipmentCategoryService {
List<String> deleteBatch(Map<String, Object> map);
ResponseModel submit(Map<String, Object> map);
/**
* 企业设备树查询
*/
List<Map<String, Object>> unitEquipTree();
}
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/EquipmentCategoryController.java
View file @ 0fd710fa
......@@ -25,7 +25,15 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
......@@ -33,8 +41,16 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.util.*;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.TreeSet;
import java.util.stream.Collectors;
/**
......@@ -58,7 +74,7 @@ public class EquipmentCategoryController extends BaseController {
@Value("${regulatory_code_prefix}")
String REGULATORY_CODE_PREFIX ;
String REGULATORY_CODE_PREFIX;
/**
......@@ -140,8 +156,8 @@ public class EquipmentCategoryController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "装备分类列表全部数据查询", notes = "装备分类列表全部数据查询")
@GetMapping(value = "/tree")
public ResponseModel<Object> tree(@RequestParam(value = "code",required = false) String code) throws Exception {
if(ObjectUtils.isEmpty(code)){
public ResponseModel<Object> tree(@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));
......@@ -156,6 +172,7 @@ public class EquipmentCategoryController extends BaseController {
tree.add(menu);
return ResponseHelper.buildResponse(tree);
}
/**
* 设备分类八大类
*
......@@ -167,7 +184,7 @@ public class EquipmentCategoryController extends BaseController {
public ResponseModel<JSONArray> selectClassify() {
List<EquipmentCategoryDto> equipmentCategoryDtos = equipmentCategoryServiceImpl.selectClassify();
JSONArray jsonArray = new JSONArray();
equipmentCategoryDtos.forEach(e->{
equipmentCategoryDtos.forEach(e -> {
jsonArray.add(e.getName());
}
);
......@@ -182,8 +199,20 @@ public class EquipmentCategoryController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "设备八大类列表树", notes = "设备八大类列表树")
@GetMapping(value = "/equipTree")
public ResponseModel<Object> equipTree(@RequestParam(value = "type",required = false) String type) {
return ResponseHelper.buildResponse( equipmentCategoryService.equipTree(type));
public ResponseModel<Object> equipTree(@RequestParam(value = "type", required = false) String type) {
return ResponseHelper.buildResponse(equipmentCategoryService.equipTree(type));
}
/**
* 企业设备八大类列表树
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "企业设备八大类列表树", notes = "企业设备八大类列表树")
@GetMapping(value = "/unit/equipTree")
public ResponseModel<List<Map<String, Object>>> unitEquipTree() {
return ResponseHelper.buildResponse(equipmentCategoryService.unitEquipTree());
}
/**
......@@ -203,21 +232,22 @@ public class EquipmentCategoryController extends BaseController {
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/createSupervisorCode", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "生成监管码和96333码", notes = "生成监管码和96333码")
public ResponseModel<Object> createSupervisorCode(@RequestBody Map<String,Object> map) {
return ResponseHelper.buildResponse(equipmentCategoryService.createSupervisorCode(map,null));
public ResponseModel<Object> createSupervisorCode(@RequestBody Map<String, Object> map) {
return ResponseHelper.buildResponse(equipmentCategoryService.createSupervisorCode(map, null));
}
/**
* 修改数据状态是否显示编辑按钮
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/updateOtherInfo", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "修改数据状态", notes = "修改数据状态")
public ResponseModel<Object> updateOtherInfo(@RequestBody Map<String,Object> map) {
public ResponseModel<Object> updateOtherInfo(@RequestBody Map<String, Object> map) {
return ResponseHelper.buildResponse(equipmentCategoryService.updateOtherInfo(map));
}
......@@ -233,12 +263,12 @@ public class EquipmentCategoryController extends BaseController {
return ResponseHelper.buildResponse(equipmentCategoryService.getFormRecordById(map));
}
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/checkCode", method = RequestMethod.POST)
@ApiOperation(httpMethod = "post", value = "校验96333码", notes = "校验96333码")
public ResponseModel<Object> checkCode(@RequestBody Map<String,Object> obj){
public ResponseModel<Object> checkCode(@RequestBody Map<String, Object> obj) {
List<CategoryOtherInfo> categoryOtherInfos = equipmentCategoryService.checkCode(obj);
if(categoryOtherInfos.size() == 0){
if (categoryOtherInfos.size() == 0) {
return ResponseHelper.buildResponse(categoryOtherInfos);
} else {
ResponseModel<Object> response = new ResponseModel();
......@@ -263,12 +293,10 @@ public class EquipmentCategoryController extends BaseController {
}
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/createEquipmentCategoryData", method = RequestMethod.GET)
@ApiOperation(httpMethod = "get", value = "初始化一码通总览数据", notes = "初始化一码通总览数据")
public ResponseModel<Object> createEquipmentCategoryData(){
public ResponseModel<Object> createEquipmentCategoryData() {
equipmentCategoryService.createEquipmentCategoryData();
return ResponseHelper.buildResponse("SUCCESS");
}
......@@ -281,7 +309,7 @@ public class EquipmentCategoryController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/deleteBatch", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "批量删除一码通数据", notes = "批量删除一码通数据")
public ResponseModel<Object> deleteBatch(@RequestBody Map<String,Object> map) {
public ResponseModel<Object> deleteBatch(@RequestBody Map<String, Object> map) {
return ResponseHelper.buildResponse(equipmentCategoryService.deleteBatch(map));
}
......@@ -302,7 +330,7 @@ public class EquipmentCategoryController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/refresh")
@ApiOperation(httpMethod = "GET", value = "更新管辖分局树缓存，运维人员使用", notes = "更新管辖分局树缓存，运维人员使用")
public ResponseModel<Object> refreshTree(){
public ResponseModel<Object> refreshTree() {
return ResponseHelper.buildResponse(equipmentCategoryService.creatTree());
}
......@@ -310,7 +338,7 @@ public class EquipmentCategoryController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getTable")
@ApiOperation(httpMethod = "GET", value = "设备认领和设备管理通用接口", notes = "设备认领和设备管理通用接口")
public ResponseModel<Page<Map<String,Object>>> getTable(@RequestParam Map<String,Object> map) {
public ResponseModel<Page<Map<String, Object>>> getTable(@RequestParam Map<String, Object> map) {
return ResponseHelper.buildResponse(equipmentCategoryServiceImpl.getTable(map));
}
......@@ -323,16 +351,14 @@ public class EquipmentCategoryController extends BaseController {
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/scalp")
@ApiOperation(httpMethod = "GET", value = "设备筛选下拉", notes = "设备筛选下拉")
public ResponseModel<List<Map<String, Object>>> scalp(@RequestParam Map<String,Object> map) {
public ResponseModel<List<Map<String, Object>>> scalp(@RequestParam Map<String, Object> map) {
return ResponseHelper.buildResponse(equipmentCategoryServiceImpl.scalp(map));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getChildren")
@ApiOperation(httpMethod = "GET", value = "通过设备种类code获取设备类别", notes = "通过设备种类code获取设备类别")
......@@ -341,7 +367,6 @@ public class EquipmentCategoryController extends BaseController {
}
/**
* 获取行政区划
*
......@@ -352,7 +377,7 @@ public class EquipmentCategoryController extends BaseController {
@ApiOperation(httpMethod = "GET", value = "获取行政区划", notes = "获取行政区划")
public ResponseModel<Object> getRegion(@RequestParam(value = "level", required = false) String level,
@RequestParam(value = "parentId", required = false) String parentId) {
return ResponseHelper.buildResponse(equipmentCategoryService.getRegion(level,parentId));
return ResponseHelper.buildResponse(equipmentCategoryService.getRegion(level, parentId));
}
......@@ -368,7 +393,7 @@ public class EquipmentCategoryController extends BaseController {
return ResponseHelper.buildResponse(equipmentCategoryService.getCategoryAndDefineByRecord(rowId));
}
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@GetMapping(value = "/test")
@ApiOperation(httpMethod = "GET", value = "test", notes = "test")
public ResponseModel<String> test() {
......@@ -377,11 +402,10 @@ public class EquipmentCategoryController extends BaseController {
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/viewJgAll")
@ApiOperation(httpMethod = "GET", value = "viewJgAll", notes = "viewJgAll")
public ResponseModel<Page<JSONObject>> viewJgAll( @RequestParam Map<String,Object> map) {
public ResponseModel<Page<JSONObject>> viewJgAll(@RequestParam Map<String, Object> map) {
JSONObject jsonObject = new JSONObject(map);
return ResponseHelper.buildResponse(equipmentCategoryServiceImpl.queryByKeys(jsonObject));
}
......@@ -393,9 +417,9 @@ public class EquipmentCategoryController extends BaseController {
public void exportImage(HttpServletResponse response, @RequestParam("code") String code, @RequestParam("type") String type) throws IOException, FileNotFoundException {
ImageSizeEnums imageSizeEnums = ImageSizeEnums.getEnumByCode(type);
// 获取resources目录下的文件输入流
InputStream bgImgFile = getClass().getClassLoader().getResourceAsStream("temp/"+imageSizeEnums.getBgPath());
InputStream bgImgFile = getClass().getClassLoader().getResourceAsStream("temp/" + imageSizeEnums.getBgPath());
File QrCodeFile = File.createTempFile(code, ".png");
ImageUtils.creatQRCode(QrCodeFile, bgImgFile, imageSizeEnums.getWith(), imageSizeEnums.getHeight(), REGULATORY_CODE_PREFIX+code, "", code, imageSizeEnums.getSize(), imageSizeEnums.getImagesX(), imageSizeEnums.getImagesY(), imageSizeEnums.getText1X(), imageSizeEnums.getText1Y(), imageSizeEnums.getText2X(), imageSizeEnums.getText2Y());
ImageUtils.creatQRCode(QrCodeFile, bgImgFile, imageSizeEnums.getWith(), imageSizeEnums.getHeight(), REGULATORY_CODE_PREFIX + code, "", code, imageSizeEnums.getSize(), imageSizeEnums.getImagesX(), imageSizeEnums.getImagesY(), imageSizeEnums.getText1X(), imageSizeEnums.getText1Y(), imageSizeEnums.getText2X(), imageSizeEnums.getText2Y());
ImageUtils.downloadResource(code + ".png", QrCodeFile.getAbsolutePath(), response);
QrCodeFile.delete();
}
......@@ -410,19 +434,19 @@ public class EquipmentCategoryController extends BaseController {
List<File> fileList = new ArrayList<>();
List<EquipExportVo> equipExportData = equipmentCategoryServiceImpl.getEquipExportData(dto);
List<EquipExportVo> unique = equipExportData.stream().collect(
Collectors. collectingAndThen(
Collectors.collectingAndThen(
Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getSupervisoryCode() + ";" + o.getCode96333()))), ArrayList::new)
);
for (EquipExportVo equipExportDatum : unique) {
InputStream bgImgFile = getClass().getClassLoader().getResourceAsStream("temp/"+imageSizeEnums.getBgPath());
InputStream bgImgFile = getClass().getClassLoader().getResourceAsStream("temp/" + imageSizeEnums.getBgPath());
if ("DT".equals(type) && !ObjectUtils.isEmpty(equipExportDatum.getCode96333())) {
File QrCodeFile = File.createTempFile(equipExportDatum.getCode96333(), ".png");
ImageUtils.creatQRCode(QrCodeFile, bgImgFile, imageSizeEnums.getWith(), imageSizeEnums.getHeight(), REGULATORY_CODE_PREFIX+equipExportDatum.getCode96333(), "", equipExportDatum.getCode96333(), imageSizeEnums.getSize(), imageSizeEnums.getImagesX(), imageSizeEnums.getImagesY(), imageSizeEnums.getText1X(), imageSizeEnums.getText1Y(), imageSizeEnums.getText2X(), imageSizeEnums.getText2Y());
fileList.add(new File( QrCodeFile.getAbsolutePath()));
ImageUtils.creatQRCode(QrCodeFile, bgImgFile, imageSizeEnums.getWith(), imageSizeEnums.getHeight(), REGULATORY_CODE_PREFIX + equipExportDatum.getCode96333(), "", equipExportDatum.getCode96333(), imageSizeEnums.getSize(), imageSizeEnums.getImagesX(), imageSizeEnums.getImagesY(), imageSizeEnums.getText1X(), imageSizeEnums.getText1Y(), imageSizeEnums.getText2X(), imageSizeEnums.getText2Y());
fileList.add(new File(QrCodeFile.getAbsolutePath()));
} else if (!ObjectUtils.isEmpty(equipExportDatum.getSupervisoryCode())) {
File QrCodeFile = File.createTempFile(equipExportDatum.getSupervisoryCode(), ".png");
ImageUtils.creatQRCode(QrCodeFile, bgImgFile, imageSizeEnums.getWith(), imageSizeEnums.getHeight(), REGULATORY_CODE_PREFIX+equipExportDatum.getSupervisoryCode(), "", equipExportDatum.getSupervisoryCode(), imageSizeEnums.getSize(), imageSizeEnums.getImagesX(), imageSizeEnums.getImagesY(), imageSizeEnums.getText1X(), imageSizeEnums.getText1Y(), imageSizeEnums.getText2X(), imageSizeEnums.getText2Y());
fileList.add(new File( QrCodeFile.getAbsolutePath()));
ImageUtils.creatQRCode(QrCodeFile, bgImgFile, imageSizeEnums.getWith(), imageSizeEnums.getHeight(), REGULATORY_CODE_PREFIX + equipExportDatum.getSupervisoryCode(), "", equipExportDatum.getSupervisoryCode(), imageSizeEnums.getSize(), imageSizeEnums.getImagesX(), imageSizeEnums.getImagesY(), imageSizeEnums.getText1X(), imageSizeEnums.getText1Y(), imageSizeEnums.getText2X(), imageSizeEnums.getText2Y());
fileList.add(new File(QrCodeFile.getAbsolutePath()));
}
bgImgFile.close();
}
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/EquipmentCategoryServiceImpl.java
View file @ 0fd710fa
......@@ -10,12 +10,26 @@ import com.google.common.collect.Lists;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.tcm.api.dto.*;
import com.yeejoin.amos.boot.module.tcm.api.entity.*;
import com.yeejoin.amos.boot.module.tcm.api.dto.ESEquipmentCategoryDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.EquInfoDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.EquipExportDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.EquipmentCategoryDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.UseUnitCreditCodeCategoryDto;
import com.yeejoin.amos.boot.module.tcm.api.entity.CategoryOtherInfo;
import com.yeejoin.amos.boot.module.tcm.api.entity.EquipmentCategory;
import com.yeejoin.amos.boot.module.tcm.api.entity.EquipmentCategoryData;
import com.yeejoin.amos.boot.module.tcm.api.entity.SupervisoryCodeInfo;
import com.yeejoin.amos.boot.module.tcm.api.entity.UseInfo;
import com.yeejoin.amos.boot.module.tcm.api.enums.EquimentEnum;
import com.yeejoin.amos.boot.module.tcm.api.enums.EquipmentCategoryEnum;
import com.yeejoin.amos.boot.module.tcm.api.enums.EquipmentClassifityEnum;
import com.yeejoin.amos.boot.module.tcm.api.mapper.*;
import com.yeejoin.amos.boot.module.tcm.api.enums.UnitTypeEnum;
import com.yeejoin.amos.boot.module.tcm.api.mapper.CategoryOtherInfoMapper;
import com.yeejoin.amos.boot.module.tcm.api.mapper.EquipmentCategoryDataMapper;
import com.yeejoin.amos.boot.module.tcm.api.mapper.EquipmentCategoryMapper;
import com.yeejoin.amos.boot.module.tcm.api.mapper.SuperviseInfoMapper;
import com.yeejoin.amos.boot.module.tcm.api.mapper.SupervisoryCodeInfoMapper;
import com.yeejoin.amos.boot.module.tcm.api.mapper.UseInfoMapper;
import com.yeejoin.amos.boot.module.tcm.api.service.IEquipmentCategoryService;
import com.yeejoin.amos.boot.module.tcm.api.vo.EquipExportVo;
import com.yeejoin.amos.boot.module.tcm.biz.dao.ESEquipmentCategory;
......@@ -23,6 +37,7 @@ import com.yeejoin.amos.boot.module.tcm.biz.utils.JsonUtils;
import com.yeejoin.amos.boot.module.tcm.flc.api.feign.IdxFeignService;
import com.yeejoin.amos.boot.module.tcm.flc.api.feign.PrivilegeFeginService;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.component.feign.utils.FeignUtil;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import lombok.extern.slf4j.Slf4j;
......@@ -54,7 +69,18 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.io.IOException;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.StringJoiner;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
import static com.alibaba.fastjson.JSON.toJSONString;
......@@ -69,85 +95,72 @@ import static com.alibaba.fastjson.JSON.toJSONString;
@Slf4j
public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryDto, EquipmentCategory, EquipmentCategoryMapper> implements IEquipmentCategoryService {
//一码通码自动生成
final static String CREATE = "1";
//一码通码手动输入
final static String NOT_CREATE = "0";
@Autowired
ESEquipmentCategory esEquipmentCategory;
@Autowired
private SuperviseInfoMapper superviseInfoMapper;
private static final String TABLENAME = "tableName";
//管辖机构redis缓存key
private static final String REGULATOR_UNIT_TREE = "REGULATOR_UNIT_TREE";
//行政区划redis缓存key
private static final String PROVINCE = "PROVINCE";
private static final String CITY = "CITY";
private static final String REGION = "REGION";
//西安行政区划code
private static final String XIAN = "610100";
//判断行政区划查询市还是区
private static final String END_CODE = "0000";
//一码通监督管理表单id
private static final String SUPERVISION_FROM_ID = "1627903532906602497";
//一码通使用信息表单id
private static final String USE_INFO_FROM_ID = "1627903393253056514";
//一码通复制功能url参数key
private static final String COPY_KEY = "stashType";
/**
* levlel=company,是企业,如果不是都是监管单位,
* * 在接口中查询当前登录人所属单位是监管单位还是企业。
* * 如果为监管单位添加监管机构查询参数（ORG_BRANCH_CODE）；
* * 如果为企业添加使用单位查询参数(USE_UNIT_CREDIT_CODE)
*/
private static final String LEVEL = "company";
private static final String EQUSTATE = "EQU_STATE";
private static final String USEPLACE = "USE_PLACE";
private static String USE_CODE = "use_code";
private static String ORG_BRANCH_CODE = "supervise_org_code";
@Autowired
private UseInfoMapper useInfoMapper;
ESEquipmentCategory esEquipmentCategory;
@Autowired
EquipmentCategoryMapper equipmentCategoryMapper;
@Value("classpath:/json/equipCategory.json")
private Resource equipCategory;
@Autowired
private JdbcTemplate bizJdbcTemplate;
@Autowired
CategoryOtherInfoMapper categoryOtherInfoMapper;
@Autowired
SupervisoryCodeInfoMapper supervisoryCodeInfoMapper;
@Autowired
SuperviseInfoService superviseInfoService;
@Autowired
EquipmentCategoryDataMapper equipmentCategoryDataMapper;
@Autowired
EquipmentCategoryDataServiceImpl equipmentCategoryDataService;
@Autowired
PrivilegeFeginService privilegeFeginService;
@Autowired
IdxFeignService idxFeignService;
@Autowired
private static final String TABLENAME = "tableName";
RestHighLevelClient restHighLevelClient;
@Autowired
private SuperviseInfoMapper superviseInfoMapper;
@Autowired
private UseInfoMapper useInfoMapper;
@Value("classpath:/json/equipCategory.json")
private Resource equipCategory;
@Autowired
private JdbcTemplate bizJdbcTemplate;
@Value("${regulator.unit.code}")
private String code;
@Autowired
RestHighLevelClient restHighLevelClient;
@Autowired
private RedisUtils redisUtils;
//管辖机构redis缓存key
private static final String REGULATOR_UNIT_TREE = "REGULATOR_UNIT_TREE";
//行政区划redis缓存key
private static final String PROVINCE = "PROVINCE";
private static final String CITY = "CITY";
private static final String REGION = "REGION";
//西安行政区划code
private static final String XIAN = "610100";
//判断行政区划查询市还是区
private static final String END_CODE = "0000";
//一码通监督管理表单id
private static final String SUPERVISION_FROM_ID = "1627903532906602497";
//一码通使用信息表单id
private static final String USE_INFO_FROM_ID = "1627903393253056514";
//一码通码自动生成
final static String CREATE = "1";
//一码通码手动输入
final static String NOT_CREATE = "0";
//一码通复制功能url参数key
private static final String COPY_KEY = "stashType";
private static String USE_CODE = "use_code";
private static String ORG_BRANCH_CODE = "supervise_org_code";
/**
* 分页查询
......@@ -177,12 +190,15 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
} else {
mapList = resourceJson.get(type);
}
if (!ValidationUtil.isEmpty(mapList)) {
for (Map map : mapList) {
Map<String, Object> resultMap = new HashMap<>();
resultMap.put("instanceName", map.get("name"));
resultMap.put("instanceId", map.get("code"));
menus.add(resultMap);
}
}
return menus;
}
......@@ -342,7 +358,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
continue;
}
// 删除检验检测机构类似公司
if(excludeCompanyType.equals(e.get("companyType"))){
if (excludeCompanyType.equals(e.get("companyType"))) {
it.remove();
// 一行数据可能 满足几个remove，所以需要删除后，继续下一循环
continue;
......@@ -359,7 +375,6 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
return result;
}
@Override
public List<LinkedHashMap> getRegion(String level, String parentId) {
List<LinkedHashMap> list;
......@@ -612,7 +627,6 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
return elevatorCode.toString();
}
/**
* 获取当前登录人单位类型
*
......@@ -620,8 +634,6 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
*/
public List<JSONObject> getCompanyType() {
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
List<CompanyModel> companys = reginParams.getUserModel().getCompanys();
......@@ -636,7 +648,6 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
return objectList;
}
@Override
public Map<String, Map<String, Object>> getFormRecordById(Map<String, Object> map) {
ResponseModel<Map<String, Map<String, Object>>> responseModel = idxFeignService.getFormRecordById(map);
......@@ -701,16 +712,6 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
return page;
}
/**
* levlel=company,是企业,如果不是都是监管单位,
* * 在接口中查询当前登录人所属单位是监管单位还是企业。
* * 如果为监管单位添加监管机构查询参数（ORG_BRANCH_CODE）；
* * 如果为企业添加使用单位查询参数(USE_UNIT_CREDIT_CODE)
*/
private static final String LEVEL = "company";
private static final String EQUSTATE = "EQU_STATE";
private static final String USEPLACE = "USE_PLACE";
public Page<Map<String, Object>> getTable(Map<String, Object> map) {
if (!ValidationUtil.isEmpty(map.get(EQUSTATE))) {
......@@ -1077,7 +1078,6 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
return responseModel;
}
//分页查询所有数据
public Page<Map<String, Object>> getAll(Map<String, Object> map) {
String tableName = map.get(TABLENAME).toString();
......@@ -1350,4 +1350,26 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
}
return totle;
}
@Override
public List<Map<String, Object>> unitEquipTree() {
List<Map<String, Object>> cylinderMapList;
List<CompanyModel> companyModels = FeignUtil.remoteCall(() -> Privilege.companyClient.queryListByChild(RequestContext.getExeUserId()));
if (companyModels.isEmpty()) {
return Lists.newArrayList();
}
AtomicBoolean isCylinderUnit = new AtomicBoolean(false);
companyModels.forEach(companyModel -> {
if (companyModel.getCompanyType().contains(UnitTypeEnum.czdw.getName())) {
isCylinderUnit.set(true);
}
});
List<Map<String, Object>> unitEquipCategoryList = equipTree(null);
if (isCylinderUnit.get()){
Map<String, List<Map<String, Object>>> resourceJson = JsonUtils.getResourceJson(equipCategory);
cylinderMapList = resourceJson.get(EquipmentClassifityEnum.CYLINDER.getCode());
unitEquipCategoryList.addAll(cylinderMapList);
}
return unitEquipCategoryList;
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/json/equipCategory.json
View file @ 0fd710fa
......@@ -114,5 +114,11 @@
"name": "客运索道",
"code": "9000"
}
],
"cylinder": [
{
"instanceName": "气瓶",
"instanceId": "2300"
}
]
}
\ 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