数采仪列表的需求完成

src/main/java/com/cn/esermis/coding/PollutionWater.java

@@ -0,0 +1,128 @@
+package com.cn.esermis.coding;
+
+
+import com.cn.esermis.CodeMean;
+
+/**
+ * Created by xiaoyao9184 on 2018/3/26.
+ */
+public enum PollutionWater implements CodeMean {
+
+    w00000("污水","B01","升/秒","立方米","N5.2"),
+    w01001("pH值","001","无量纲","N2.2"),
+    w01002("色度","002","[色]度","N3.2"),
+    w01006("溶解性总固体","--","毫克/升","千克","N4"),
+    w01009("溶解氧","--","毫克/升","N3.1"),
+    w01010("水温","--","摄氏度","N3.1"),
+    w01012("悬浮物","003","毫克/升","千克","N4"),
+    w01014("电导率","--","微西[门子]/厘米","N3.1"),
+    w01017("五日生化需氧量","010","毫克/升","千克","N5.1"),
+    w01018("化学需氧量","011","毫克/升","千克","N5.1"),
+    w01019("高锰酸盐指数","--","毫克/升","千克","N3.1"),
+    w01020("总有机碳","015","毫克/升","千克","N3.1"),
+    w02003("粪大肠菌群","550","个/升","N9"),
+    w02006("细菌总数","--","个/升","N9"),
+    w03001("总α放射性","570","贝可[勒尔]/升","N3.1"),
+    w03002("总β放射性","571","贝可[勒尔]/升","N3.1"),
+    w19001("表面活性剂","--","毫克/升","千克","N3.2"),
+    w19002("阴离子表面活性剂","520","毫克/升","千克","N3.2"),
+    w20012("钡","039","毫克/升","千克","N3.3"),
+    w20023("硼","037","毫克/升","千克","N3.3"),
+    w20038("钴","040","毫克/升","千克","N3.4"),
+    w20061("钼","038","毫克/升","千克","N3.4"),
+    w20089("铊","041","纳克/升","毫克","N4"),
+    w20092("锡","036","毫克/升","千克","N3.1"),
+    w20111("总汞","020","微克/升","克","N3.2"),
+    w20113("烷基汞","021","纳克/升","毫克","N4"),
+    w20115("总镉","022","微克/升","克","N3.1"),
+    w20116("总铬","023","毫克/升","千克","N3.3"),
+    w20117("六价铬","024","微克/升","克","N2.3"),
+    w20119("总砷","026","微克/升","克","N2.3"),
+    w20120("总铅","027","微克/升","克","N4"),
+    w20121("总镍","028","毫克/升","千克","N3.2"),
+    w20122("总铜","029","毫克/升","千克","N3.2"),
+    w20123("总锌","030","毫克/升","千克","N3.3"),
+    w20124("总锰","031","毫克/升","千克","N3.3"),
+    w20125("总铁","032","毫克/升","千克","N3.3"),
+    w20126("总银","033","毫克/升","千克","N3.3"),
+    w20127("总铍","034","微克/升","克","N3.3"),
+    w20128("总硒","035","微克/升","克","N4.2"),
+    w20138("铜","毫克/升","千克","N3.3"),
+    w20139("锌","毫克/升","千克","N3.3"),
+    w20140("硒","毫克/升","千克","N3.3"),
+    w20141("砷","毫克/升","千克","N3.3"),
+    w20142("汞","微克/升","克","N3.3"),
+    w20143("镉","微克/升","克","N3.3"),
+    w20144("铅","毫克/升","千克","N3.3"),
+    w21001("总氮","065","毫克/升","千克","N4.2"),
+    w21003("氨氮","060","毫克/升","千克","N4.2"),
+    w21004("凯氏氮","062","毫克/升","千克","N3.1"),
+    w21006("亚硝酸盐","063","毫克/升","千克","N2.3"),
+    w21007("硝酸盐","064","毫克/升","千克","N2.3"),
+    w21011("总磷","101","毫克/升","千克","N3.2"),
+    w21016("氰化物","070","毫克/升","千克","N3.3"),
+    w21017("氟化物","072","毫克/升","千克","N4.2"),
+    w21019("硫化物","071","毫克/升","千克","N3.3"),
+    w21022("氯化物","090","毫克/升","千克","N3.1"),
+    w21038("硫酸盐","--","毫克/升","千克","N6"),
+    w22001("石油类","080","毫克/升","千克","N3.2"),
+    w23002("挥发酚","110","毫克/升","千克","N3.4"),
+    w25043("苯并[α]芘","540","微克/升","克","N3.1"),
+    w33001("六六六","350","纳克/升","毫克","N4"),
+    w33007("滴滴涕","351","纳克/升","毫克","N4"),
+    w99001("有机氮","061","毫克/升","千克","N3.1")
+    ;
+
+    private String code;
+    private String meaning;
+    private String oldCode;
+    private String chromaUnit;
+    private String amountUnit;
+    private String type;
+
+    PollutionWater(String meaning, String chromaUnit, String amountUnit, String type){
+        this.code = name();
+        this.meaning = meaning;
+        this.oldCode = "--";
+        this.chromaUnit = chromaUnit;
+        this.amountUnit = amountUnit;
+        this.type = type;
+    }
+
+    PollutionWater(String meaning, String oldCode, String chromaUnit, String amountUnit, String type){
+        this.code = name();
+        this.meaning = meaning;
+        this.oldCode = oldCode;
+        this.chromaUnit = chromaUnit;
+        this.amountUnit = amountUnit;
+        this.type = type;
+    }
+
+    @Override
+    public String code() {
+        return code;
+    }
+
+    @Override
+    public String mean() {
+        return meaning;
+    }
+
+
+    public String oldCode() {
+        return oldCode;
+    }
+    public String chromaUnit() {
+        return chromaUnit;
+    }
+    public String amountUnit() {
+        return amountUnit;
+    }
+
+    public String unit() {
+        return chromaUnit + " " + amountUnit;
+    }
+    public String type() {
+        return type;
+    }
+}

src/main/java/com/cn/esermis/config/BizException.java

@@ -0,0 +1,56 @@
+package com.cn.esermis.config;
+
+
+import lombok.Getter;
+
+@Getter
+public class BizException extends RuntimeException {
+
+    private static final long serialVersionUID = 1L;
+
+
+    protected String errorCode;
+
+    protected String errorMsg;
+
+    public BizException() {
+        super();
+    }
+
+    public BizException(String errorMsg) {
+        super(errorMsg);
+        this.errorMsg = errorMsg;
+    }
+
+    public BizException(String errorCode, String errorMsg) {
+        super(errorCode);
+        this.errorCode = errorCode;
+        this.errorMsg = errorMsg;
+    }
+
+    public BizException(String errorCode, String errorMsg, Throwable cause) {
+        super(errorCode, cause);
+        this.errorCode = errorCode;
+        this.errorMsg = errorMsg;
+    }
+
+
+    public void setErrorCode(String errorCode) {
+        this.errorCode = errorCode;
+    }
+
+    public void setErrorMsg(String errorMsg) {
+        this.errorMsg = errorMsg;
+    }
+
+    public String getMessage() {
+        return errorMsg;
+    }
+
+    @Override
+    public Throwable fillInStackTrace() {
+        return this;
+    }
+
+}
+

src/main/java/com/cn/esermis/config/GlobalExceptionHandler.java

@@ -0,0 +1,18 @@
+package com.cn.esermis.config;
+
+import com.cn.esermis.dpld.model.AjaxResult;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+@ControllerAdvice
+public class GlobalExceptionHandler {
+
+    @ExceptionHandler(BizException.class)
+    public ResponseEntity<AjaxResult> handleException(BizException e) {
+
+        AjaxResult error = AjaxResult.error(Integer.parseInt(e.getErrorCode()), e.getErrorMsg());
+        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error);
+    }
+}

src/main/java/com/cn/esermis/config/MyInterceptor.java

@@ -29,20 +29,21 @@ public class MyInterceptor  implements HandlerInterceptor  {
             BaseUser userInfo = TokenUtils.getUserInfo(token);
             if (userInfo != null){
                 // 查询数据库是否有 公司和工厂信息
-                Boolean verifyCompany = dataAcquisitionInstrumentMapper.verifyCompany(userInfo.getCompanyId());
+                String verifyCompany = dataAcquisitionInstrumentMapper.verifyCompany(userInfo.getCompanyId());
 //                Boolean verifydepartmen = dataAcquisitionInstrumentMapper.verifydepartmen(userInfo.getFactoryId());
-                if (verifyCompany){
+                if (verifyCompany!=null){
                     // 将用户信息设置到请求属性中，便于后续使用
+                    userInfo.setLevelid(verifyCompany);
                     request.setAttribute("userInfo", JSON.toJSONString(userInfo));
                     return true;
                 }else {
-                    throw new RuntimeException("用户无权限！");
+                    throw new BizException("403","用户无权限！");
                 }
             }else{
-                throw new RuntimeException("token解析失败！");
+                throw new BizException("403","token解析失败！");
             }
         }else {
-            throw new RuntimeException("token为空！");
+            throw new BizException("403","token为空！");
         }
 
     }

src/main/java/com/cn/esermis/controller/DataAcquisitionInstrumentController.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cn.esermis.dpld.entity.AnalyticalInstruments;
 import com.cn.esermis.dpld.entity.DataAcquisitionInstrument;
 import com.cn.esermis.dpld.entity.DetectMonitoringFactor;
+import com.cn.esermis.dpld.mapper.DataAcquisitionInstrumentMapper;
 import com.cn.esermis.dpld.model.AjaxResult;
 import com.cn.esermis.dpld.model.AnalyticalInstrumentsVo;
 import com.cn.esermis.dpld.model.DataAcquisitionInstrumentVo;
@@ -42,52 +43,72 @@ public class DataAcquisitionInstrumentController {
     private IDetectMonitoringFactorService detectMonitoringFactorService;
     @Resource
     private IDataAcquisitionInstrumentService dataAcquisitionInstrumentService;
+    @Resource
+    private   DataAcquisitionInstrumentMapper dataAcquisitionInstrumentMapper;
     @Autowired
     private RedisTemplate<String, Object> redisTemplate;
+
     /**
      * 获取数采仪信息表
      */
     @GetMapping("/list")
-    public AjaxResult list(DataAcquisitionInstrumentVo vo, HttpServletRequest request)
-    {
+    public AjaxResult list(DataAcquisitionInstrumentVo vo, HttpServletRequest request) {
         IPage<DataAcquisitionInstrument> page = new Page<>(vo.getPageNum(), vo.getPageSize());
         QueryWrapper<DataAcquisitionInstrument> wrapper = new QueryWrapper<>();
         BaseUser userInfo = TokenUtils.getUserInfo(extractToken(request));
-//        wrapper.eq("company_code",userInfo.getCompanyId());
+        String verifyCompany = dataAcquisitionInstrumentMapper.verifyCompany(userInfo.getCompanyId());
+        if (vo.getCompanyName() != null) {
+            String companyId = userInfo.getCompanyId();
+            if (verifyCompany != null && verifyCompany.length() < 5) {
+                List<String> companyCodes = dataAcquisitionInstrumentService.getComponyListAll(vo.getCompanyName());
+                if (!companyCodes.isEmpty()) {
+                    wrapper.in("company_code", companyCodes);
+                }
+            }else{
+                List<String> companyCodes = dataAcquisitionInstrumentService.getComponyList(vo.getCompanyName(), companyId);
+                if (!companyCodes.isEmpty()) {
+                    wrapper.in("company_code", companyCodes);
+                }
+            }
+        }
+        if (vo.getOutletName() != null) {
+            wrapper.like("outlet_name", vo.getOutletName());
+        }
         wrapper.orderByDesc("department_code");
         IPage<DataAcquisitionInstrument> pageList = dataAcquisitionInstrumentService.page(page, wrapper);
         IPage<DataAcquisitionInstrumentVo> volits = new Page<>();
-        if (!pageList.getRecords().isEmpty()){
+        if (!pageList.getRecords().isEmpty()) {
             volits.setTotal(pageList.getTotal());
             volits.setCurrent(pageList.getCurrent());
             volits.setSize(pageList.getSize());
             List<DataAcquisitionInstrument> records = pageList.getRecords();
             List<DataAcquisitionInstrumentVo> revoList = new ArrayList<>();
             // 查询企业
-            Map<String,Object> componyMap =  dataAcquisitionInstrumentService.getComponyMap();
+            Map<String, Object> componyMap = dataAcquisitionInstrumentService.getComponyMap();
             // 查询工厂
             Map<String, Object> departmentMap = dataAcquisitionInstrumentService.getDepartmentMap();
-            records.forEach(x->{
+            records.forEach(x -> {
                 DataAcquisitionInstrumentVo instrumentVo = new DataAcquisitionInstrumentVo();
                 List<AnalyticalInstruments> analyticalInstruments = analyticalInstrumentsService.getByDataAcquisitionInstrumentid(x.getId());
                 BeanUtils.copyProperties(x, instrumentVo);
-                if (instrumentVo.getCompanyCode()!=null  && componyMap.get(instrumentVo.getCompanyCode())!=null){
-                    Map componyMapobj = (Map)componyMap.get(instrumentVo.getCompanyCode());
+                if (instrumentVo.getCompanyCode() != null && componyMap.get(instrumentVo.getCompanyCode()) != null) {
+                    Map componyMapobj = (Map) componyMap.get(instrumentVo.getCompanyCode());
                     instrumentVo.setCompanyName(componyMapobj.get("companylongname").toString());
                 }
-                if (instrumentVo.getDepartmentCode()!=null && departmentMap.get(instrumentVo.getDepartmentCode())!=null){
-                    Map componyMapobj = (Map)departmentMap.get(instrumentVo.getDepartmentCode());
+                if (instrumentVo.getDepartmentCode() != null && departmentMap.get(instrumentVo.getDepartmentCode()) != null) {
+                    Map componyMapobj = (Map) departmentMap.get(instrumentVo.getDepartmentCode());
                     instrumentVo.setDepartmentName(componyMapobj.get("departmentname").toString());
-                };
-                if (!analyticalInstruments.isEmpty()){
+                }
+                ;
+                if (!analyticalInstruments.isEmpty()) {
                     List<AnalyticalInstrumentsVo> analyticalInstrumentList = new ArrayList<>();
-                    analyticalInstruments.forEach(y->{
+                    analyticalInstruments.forEach(y -> {
                         AnalyticalInstrumentsVo analyticalInstrumentsVo = new AnalyticalInstrumentsVo();
                         BeanUtils.copyProperties(y, analyticalInstrumentsVo);
                         analyticalInstrumentList.add(analyticalInstrumentsVo);
                         List<DetectMonitoringFactor> analyticalInstrumentId = detectMonitoringFactorService.listByParentId(y.getId());
-                        if (!analyticalInstrumentId.isEmpty()){
-                            analyticalInstrumentId.forEach(z->{
+                        if (!analyticalInstrumentId.isEmpty()) {
+                            analyticalInstrumentId.forEach(z -> {
                                 analyticalInstrumentsVo.getDetectMonitoringFactors().add(z);
                             });
                         }
@@ -107,21 +128,20 @@ public class DataAcquisitionInstrumentController {
      * 根据菜单编号获取详细信息
      */
     @GetMapping(value = "delete/{id}")
-    public AjaxResult delete(@PathVariable String id)
-    {
+    public AjaxResult delete(@PathVariable String id) {
         DataAcquisitionInstrument dataAcquisitionInstrument = dataAcquisitionInstrumentService.getById(id);
         DataAcquisitionInstrumentVo instrumentVo = new DataAcquisitionInstrumentVo();
-        if (dataAcquisitionInstrument != null){
+        if (dataAcquisitionInstrument != null) {
             BeanUtils.copyProperties(dataAcquisitionInstrument, instrumentVo);
             List<AnalyticalInstruments> analyticalInstruments = analyticalInstrumentsService.getByDataAcquisitionInstrumentid(dataAcquisitionInstrument.getId());
-            if (!analyticalInstruments.isEmpty()){
+            if (!analyticalInstruments.isEmpty()) {
                 List<AnalyticalInstrumentsVo> analyticalInstrumentList = new ArrayList<>();
-                analyticalInstruments.forEach(y->{
+                analyticalInstruments.forEach(y -> {
                     if (y.getId() != null)
-                    detectMonitoringFactorService.remove(new QueryWrapper<DetectMonitoringFactor>().eq("analytical_instrument_id", y.getId()));
+                        detectMonitoringFactorService.remove(new QueryWrapper<DetectMonitoringFactor>().eq("analytical_instrument_id", y.getId()));
                 });
                 if (analyticalInstruments.isEmpty())
-                analyticalInstrumentsService.remove(new QueryWrapper<AnalyticalInstruments>().eq("data_acquisition_instrument_id", dataAcquisitionInstrument.getId()));
+                    analyticalInstrumentsService.remove(new QueryWrapper<AnalyticalInstruments>().eq("data_acquisition_instrument_id", dataAcquisitionInstrument.getId()));
                 instrumentVo.setAnalyticalInstruments(analyticalInstrumentList);
             }
         }
@@ -135,27 +155,26 @@ public class DataAcquisitionInstrumentController {
      * 根据菜单编号获取详细信息
      */
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable String id)
-    {
+    public AjaxResult getInfo(@PathVariable String id) {
         DataAcquisitionInstrument dataAcquisitionInstrument = dataAcquisitionInstrumentService.getById(id);
         DataAcquisitionInstrumentVo instrumentVo = new DataAcquisitionInstrumentVo();
-        if (dataAcquisitionInstrument != null){
+        if (dataAcquisitionInstrument != null) {
             BeanUtils.copyProperties(dataAcquisitionInstrument, instrumentVo);
             List<AnalyticalInstruments> analyticalInstruments = analyticalInstrumentsService.getByDataAcquisitionInstrumentid(dataAcquisitionInstrument.getId());
-            if (!analyticalInstruments.isEmpty()){
+            if (!analyticalInstruments.isEmpty()) {
                 List<AnalyticalInstrumentsVo> analyticalInstrumentList = new ArrayList<>();
-                analyticalInstruments.forEach(x->{
-                        AnalyticalInstrumentsVo analyticalInstrumentsVo = new AnalyticalInstrumentsVo();
-                        BeanUtils.copyProperties(x, analyticalInstrumentsVo);
+                analyticalInstruments.forEach(x -> {
+                    AnalyticalInstrumentsVo analyticalInstrumentsVo = new AnalyticalInstrumentsVo();
+                    BeanUtils.copyProperties(x, analyticalInstrumentsVo);
 
-                        List<DetectMonitoringFactor> analyticalInstrumentId = detectMonitoringFactorService.listByParentId(x.getId());
-                        if (!analyticalInstrumentId.isEmpty()){
-                            analyticalInstrumentId.forEach(z->{
-                                analyticalInstrumentsVo.getDetectMonitoringFactors().add(z);
-                            });
-                        }
-                        analyticalInstrumentList.add(analyticalInstrumentsVo);
-                    });
+                    List<DetectMonitoringFactor> analyticalInstrumentId = detectMonitoringFactorService.listByParentId(x.getId());
+                    if (!analyticalInstrumentId.isEmpty()) {
+                        analyticalInstrumentId.forEach(z -> {
+                            analyticalInstrumentsVo.getDetectMonitoringFactors().add(z);
+                        });
+                    }
+                    analyticalInstrumentList.add(analyticalInstrumentsVo);
+                });
                 instrumentVo.setAnalyticalInstruments(analyticalInstrumentList);
             }
         }
@@ -170,19 +189,18 @@ public class DataAcquisitionInstrumentController {
      */
     @PostMapping("/save")
     @Transactional
-    public AjaxResult save(@Validated @RequestBody DataAcquisitionInstrumentVo vo)
-    {
+    public AjaxResult save(@Validated @RequestBody DataAcquisitionInstrumentVo vo) {
         DataAcquisitionInstrument dataAcquisitionInstrument = new DataAcquisitionInstrument();
         BeanUtils.copyProperties(vo, dataAcquisitionInstrument);
         boolean save = dataAcquisitionInstrumentService.saveOrUpdate(dataAcquisitionInstrument);
-        if (save && vo.getAnalyticalInstruments()!=null){
+        if (save && vo.getAnalyticalInstruments() != null) {
             List<AnalyticalInstrumentsVo> analyticalInstrumentList = vo.getAnalyticalInstruments();
             // 删除子项 全删全增操作
             {
-                if (dataAcquisitionInstrument.getId() != null){
+                if (dataAcquisitionInstrument.getId() != null) {
                     List<AnalyticalInstruments> dataAcquisitionInstrumentId = analyticalInstrumentsService.getByDataAcquisitionInstrumentid(dataAcquisitionInstrument.getId());
-                    if (!dataAcquisitionInstrumentId.isEmpty()){
-                        analyticalInstrumentList.forEach(y->{
+                    if (!dataAcquisitionInstrumentId.isEmpty()) {
+                        analyticalInstrumentList.forEach(y -> {
                             detectMonitoringFactorService.remove(new QueryWrapper<DetectMonitoringFactor>().eq("analytical_instrument_id", y.getId()));
                         });
                         analyticalInstrumentsService.remove(new QueryWrapper<AnalyticalInstruments>().eq("data_acquisition_instrument_id", dataAcquisitionInstrument.getId()));
@@ -190,22 +208,22 @@ public class DataAcquisitionInstrumentController {
                 }
             }
             // 新增子表
-            analyticalInstrumentList.forEach(x->{
+            analyticalInstrumentList.forEach(x -> {
                 AnalyticalInstruments analyticalInstruments = new AnalyticalInstruments();
                 BeanUtils.copyProperties(x, analyticalInstruments);
                 analyticalInstruments.setDataAcquisitionInstrumentId(dataAcquisitionInstrument.getId());
                 boolean save1 = analyticalInstrumentsService.save(analyticalInstruments);
-                if (x.getDetectMonitoringFactors()!=null && save1){
+                if (x.getDetectMonitoringFactors() != null && save1) {
                     List<DetectMonitoringFactor> detectMonitoringFactors = x.getDetectMonitoringFactors();
-                    detectMonitoringFactors.forEach(y->{
+                    detectMonitoringFactors.forEach(y -> {
                         y.setAnalyticalInstrumentId(analyticalInstruments.getId());
                         y.setDataAcquisitionInstrumentId(dataAcquisitionInstrument.getId());
                         boolean save2 = detectMonitoringFactorService.save(y);
-                        if (!save2){
+                        if (!save2) {
                             throw new RuntimeException("添加失败");
                         }
                     });
-               }
+                }
             });
         }
         List<OutletAndFactorVo> selectlist = dataAcquisitionInstrumentService.selectlist();
@@ -214,39 +232,36 @@ public class DataAcquisitionInstrumentController {
     }
 
     @GetMapping(value = "getCompony")
-    public AjaxResult getCompony()
-    {
-        List<Map<String,Object>> list = dataAcquisitionInstrumentService.getCompony();
+    public AjaxResult getCompony() {
+        List<Map<String, Object>> list = dataAcquisitionInstrumentService.getCompony();
         return success(list);
     }
 
 
     /**
      * 部门
+     *
      * @return
      */
     @GetMapping(value = "getDepartment/{componyid}")
-    public AjaxResult getDepartment(@PathVariable String componyid)
-    {
-        List<Map<String,Object>> list = dataAcquisitionInstrumentService.getDepartment(componyid);
+    public AjaxResult getDepartment(@PathVariable String componyid) {
+        List<Map<String, Object>> list = dataAcquisitionInstrumentService.getDepartment(componyid);
         return success(list);
     }
 
 
-
     /**
      * 获取数采仪信息表
      */
     @GetMapping("/listByCode")
-    public AjaxResult listByCode(HttpServletRequest  request)
-    {
+    public AjaxResult listByCode(HttpServletRequest request) {
         QueryWrapper<DataAcquisitionInstrument> wrapper = new QueryWrapper<>();
         BaseUser userInfo = TokenUtils.getUserInfo(extractToken(request));
-        if (userInfo==null){
+        if (userInfo == null) {
             return error("无数据");
         }
-        wrapper.eq(userInfo.getCompanyId()!=null,"department_code", userInfo.getCompanyId());
-        wrapper.eq(userInfo.getFactoryId()!=null,"company_code", userInfo.getFactoryId());
+        wrapper.eq(userInfo.getCompanyId() != null, "department_code", userInfo.getCompanyId());
+        wrapper.eq(userInfo.getFactoryId() != null, "company_code", userInfo.getFactoryId());
 //        List<DataAcquisitionInstrument> dataAcquisitionInstruments = dataAcquisitionInstrumentService.listByCode(vo);
         List<DataAcquisitionInstrument> dataAcquisitionInstruments = dataAcquisitionInstrumentService.list(wrapper);
         return success(dataAcquisitionInstruments);

src/main/java/com/cn/esermis/dpld/entity/AnalyticalInstruments.java

@@ -74,7 +74,7 @@ public class AnalyticalInstruments {
      * k值
      */
     @TableField(value = "k_value")
-    private String kValue;
+    private String kvalue;
     /**
      * 烟道（监测口）截面积 M3
      */

src/main/java/com/cn/esermis/dpld/mapper/DataAcquisitionInstrumentMapper.java

@@ -6,6 +6,7 @@ import com.cn.esermis.dpld.model.DataAcquisitionInstrumentVo;
 import com.cn.esermis.dpld.model.OutletAndFactorVo;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -29,5 +30,9 @@ public interface DataAcquisitionInstrumentMapper extends BaseMapper<DataAcquisit
 
     Boolean verifydepartmen(String factoryId);
 
-    Boolean verifyCompany(String companyId);
+    String verifyCompany(String companyId);
+
+    List<String> getComponyList(String companyName, String companyId);
+
+    List<String> getComponyListAll(@Param("companyName") String companyName);
 }

src/main/java/com/cn/esermis/dpld/service/IDataAcquisitionInstrumentService.java

@@ -6,7 +6,6 @@ import com.cn.esermis.dpld.model.DataAcquisitionInstrumentVo;
 import com.cn.esermis.dpld.model.OutletAndFactorVo;
 import org.springframework.stereotype.Service;
 
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -25,4 +24,8 @@ public interface IDataAcquisitionInstrumentService extends IService<DataAcquisit
     Map<String, Object> getDepartmentMap();
 
     List<DataAcquisitionInstrument> listByCode(DataAcquisitionInstrumentVo vo);
+
+    List<String> getComponyList(String companyName,String companyId);
+
+    List<String> getComponyListAll(String companyName);
 }

src/main/java/com/cn/esermis/dpld/service/impl/DataAcquisitionInstrumentServiceImpl.java

@@ -1,6 +1,5 @@
 package com.cn.esermis.dpld.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cn.esermis.dpld.entity.DataAcquisitionInstrument;
 import com.cn.esermis.dpld.mapper.DataAcquisitionInstrumentMapper;
@@ -10,7 +9,6 @@ import com.cn.esermis.dpld.service.IDataAcquisitionInstrumentService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -52,4 +50,14 @@ public class DataAcquisitionInstrumentServiceImpl extends ServiceImpl<DataAcquis
         List<DataAcquisitionInstrument> dataAcquisitionInstruments = mapper.listByCode(vo);
         return dataAcquisitionInstruments;
     }
+
+    @Override
+    public List<String> getComponyList(String companyName, String companyId) {
+        return mapper.getComponyList(companyName,companyId);
+    }
+
+    @Override
+    public List<String> getComponyListAll(String companyName) {
+        return mapper.getComponyListAll(companyName);
+    }
 }

src/main/java/com/cn/esermis/model/BaseUser.java

@@ -12,6 +12,8 @@ public class BaseUser {
 
     private String factoryId;
 
+    private String levelid;
+
 
 
 }

src/main/resources/static/mybatis/AnalyticalInstrumentsMapper.xml

@@ -4,14 +4,14 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.cn.esermis.dpld.mapper.AnalyticalInstrumentsMapper">
     <insert id="saveOb" parameterType="com.cn.esermis.dpld.entity.AnalyticalInstruments">
-        insert into analytical_instruments(id,brand,model,name,factorInfor,range,data_acquisition_instrument_id,reference_oxygen_content,velocity_field_coefficient,pitot_tube_coefficient,k_value,flue_area,dilution_ratio,type)
+        insert into analytical_instruments(id,brand,model,name,factorInfor,range_str,data_acquisition_instrument_id,reference_oxygen_content,velocity_field_coefficient,pitot_tube_coefficient,k_value,flue_area,dilution_ratio,type)
         values(#{id},#{brand},#{model},#{name},#{factorInfor},#{range},#{dataAcquisitionInstrumentId},#{referenceOxygenContent},#{velocityFieldCoefficient},#{pitotTubeCoefficient},#{kValue},#{flueArea},#{dilutionRatio},#{type})
 
     </insert>
 
     <select id="getByDataAcquisitionInstrumentid" resultType="com.cn.esermis.dpld.entity.AnalyticalInstruments"
             parameterType="java.lang.String">
-        select * from analytical_instruments
+        select t.*,t.range_str `range` from analytical_instruments t
             <where>
             <if test="productId != null">
                 and data_acquisition_instrument_id = #{productId}

src/main/resources/static/mybatis/DataAcquisitionInstrumentMapper.xml

@@ -49,8 +49,23 @@
     <select id="verifydepartmen" resultType="java.lang.Boolean">
         select count(0)>0 from department where departmentid = #{factoryId}
     </select>
-    <select id="verifyCompany" resultType="java.lang.Boolean" parameterType="java.lang.String">
-        select count(0)>0 from company where companyid =  #{companyId}
+    <select id="verifyCompany" resultType="java.lang.String" parameterType="java.lang.String">
+        select levelid from company where companyid =  #{companyId}
+    </select>
+    <select id="getComponyList" resultType="java.lang.String">
+        select distinct  a.companyid from company a inner join  company b on a.levelid like concat(LEFT(b.levelid, 2),'%')
+                                                                                 <if test="companyId != null and companyId != ''">
+                                                                                     and b.companyid = #{companyId}
+                                                                                 </if>
+        <if test="companyName != null and companyName != ''">
+            where a.companyname like concat('%',#{companyName},'%')
+        </if>
+    </select>
+    <select id="getComponyListAll" resultType="java.lang.String">
+        select companyid from company
+        <if test="companyName != null and companyName != ''">
+            where companyname like concat('%',#{companyName},'%')
+        </if>
     </select>
 </mapper>
 

src/main/resources/static/mybatis/DetectMonitoringFactorMapper.xml

@@ -6,7 +6,7 @@
 
 
     <select id="listByParentId" resultType="com.cn.esermis.dpld.entity.DetectMonitoringFactor">
-        select * from monitoring_factor
+        select t.*,t.range_str `range` from monitoring_factor t
         <where>
             <if test="parentId != null">
                 and analytical_instrument_id = #{parentId}