liyg преди 2 години
родител
ревизия
45531112f0

+ 7 - 5
src/main/java/com/steerinfo/dil/config/ImageFileUtils.java

@@ -15,8 +15,10 @@ import java.util.*;
 @Component
 public class ImageFileUtils implements FileUtils {
 
-    @Value(value = "${piction.path:/shared}" )
-    private String path;
+    @Value(value = "${prefix.filePrefix}" )
+    private String filePrefix;//文件前缀
+    @Value(value = "${filePath}" )
+    private String path;//文件路径
 
     public static final HashMap fileTypes = new HashMap();
 
@@ -117,18 +119,18 @@ public class ImageFileUtils implements FileUtils {
 
 
     /**
-     * 上传单张图片
+     * 上传单个文件
      * @param file
      * @return
      * @throws Exception
      */
-    public synchronized String updateFile(MultipartFile file,long workerId) throws Exception {
+    public String updateFile(MultipartFile file,long workerId) throws Exception {
         //首先通过Calendard对象获得年月日
         Calendar calendar= Calendar.getInstance();
         int year = calendar.get(Calendar.YEAR);
         int month = calendar.get(Calendar.MONTH);
         int day= calendar.get(Calendar.DAY_OF_MONTH);
-        String url = UploadUtils.uploadFile(file, new IdGenerator(workerId%31, 10), path, File.separator+year+ File.separator+month+ File.separator+day+ File.separator);
+        String url = filePrefix + UploadUtils.uploadFile(file, new IdGenerator(workerId%31, 10), path, File.separator+year+ File.separator+month+ File.separator+day+ File.separator);
         return url;
     }
 

+ 1 - 1
src/main/java/com/steerinfo/dil/controller/BMSController.java

@@ -1,6 +1,6 @@
 package com.steerinfo.dil.controller;
 
-import com.steerinfo.dil.config.ImageFileUtils;
+
 import com.steerinfo.dil.feign.BmsFeign;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;

+ 58 - 116
src/main/java/com/steerinfo/dil/controller/RMScontroller.java

@@ -8,6 +8,7 @@ import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.java.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -99,7 +100,7 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.LinkInsertSelective(mapValue);
     }
 
-    //物资类型
+    //================物资类型
     @PostMapping("/getMaterialTypeList")
     @ApiOperation(value = "查询物资种类列表")
     public Map<String, Object> getMaterialTypeList(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -138,7 +139,7 @@ public class RMScontroller extends BaseRESTfulController {
     }
 
 
-    //物资
+    //====================物资
     @ApiOperation(value="获取物资列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -174,7 +175,7 @@ public class RMScontroller extends BaseRESTfulController {
     @ApiOperation(value="更新物资", notes="根据rmsMaterial对象创建")
     @ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsMaterial", required = true, dataType = "rmsMaterial")
     @PostMapping(value = "/updateMaterial")
-    @LogAround(foreignKeys = {"materialId"},foreignKeyTypes = {"物资"},description = "修改物资")
+    @LogAround(foreignKeys = {"operationPointId"},foreignKeyTypes = {"物资"},description = "修改物资")
     public Map<String, Object> updateMaterial(@RequestBody(required = false) Map<String, Object> map){
         return rmsFeign.updateMaterial(map);
     }
@@ -185,6 +186,53 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.getMaterialById(id);
     }
 
+
+    //====================作业点
+    @ApiOperation(value="获取作业点列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getOperationPointList")
+    public Map<String, Object> getOperationPointList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize
+    ){
+        return   rmsFeign.getOperationPointList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+    @ApiOperation(value="新增作业点", notes="根据rmsOperationPoint对象创建")
+    @ApiImplicitParam(name = "rmsOperationPoint", value = "详细实体rmsOperationPoint", required = true, dataType = "rmsOperationPoint")
+    @PostMapping(value = "/insertOperationPoint")
+    @LogAround(foreignKeys = {"operationPointId"},foreignKeyTypes = {"作业点"},description = "新增作业点")
+    public Map<String, Object> insertOperationPoint(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.insertOperationPoint(map);
+    }
+    @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
+    @ApiImplicitParam(name = "rmsOperationPoint", value = "详细实体rmsOperationPoint", required = true, dataType = "rmsOperationPoint")
+    @PostMapping(value = "/deleteOperationPoint")
+    @LogAround(foreignKeys = {"operationPointId"},foreignKeyTypes = {"作业点"},description = "删除作业点")
+    public Map<String, Object> deleteOperationPoint(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.deleteOperationPoint(map);
+    }
+
+    @ApiOperation(value="更新作业点", notes="根据rmsOperationPoint对象创建")
+    @ApiImplicitParam(name = "rmsOperationPoint", value = "详细实体rmsOperationPoint", required = true, dataType = "rmsOperationPoint")
+    @PostMapping(value = "/updateOperationPoint")
+    @LogAround(foreignKeys = {"operationPointId"},foreignKeyTypes = {"作业点"},description = "修改作业点")
+    public Map<String, Object> updateOperationPoint(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.updateOperationPoint(map);
+    }
+    @ApiOperation(value="根据id查询原料信息", notes="根据rmsCarrier对象创建")
+    @ApiImplicitParam(name = "rmsOperationPoint", value = "详细实体rmsOperationPoint", required = true, dataType = "rmsOperationPoint")
+    @PostMapping(value = "/getOperationPointById/{id}")
+    public Map<String, Object> getOperationPointById(@PathVariable("id") BigDecimal id){
+        return rmsFeign.getOperationPointById(id);
+    }
+
     //============人员信息
     @ApiOperation(value="获取人员信息列表")
     @ApiImplicitParams({
@@ -208,22 +256,26 @@ public class RMScontroller extends BaseRESTfulController {
     @ApiOperation(value="新增人员信息", notes="根据rmsMaterial对象创建")
     @ApiImplicitParam(name = "rmsPersonnel", value = "详细实体rmsPersonnel", required = true, dataType = "rmsPersonnel")
     @PostMapping(value = "/insertPersonnel")
+    @LogAround(foreignKeys = {"personnelId"},foreignKeyTypes = {"人员"})
     public Map<String, Object> insertPersonnel(@RequestBody(required = false) Map<String, Object> map){
         return rmsFeign.insertPersonnel(map);
     }
     @ApiOperation(value="删除", notes="根据rmsPersonnel对象创建")
     @ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsPersonnel", required = true, dataType = "rmsPersonnel")
-    @PostMapping(value = "/deletePersonnel/{id}")
-    public Map<String, Object> deletePersonnel(@PathVariable("id")BigDecimal id){
-        return rmsFeign.deletePersonnel(id);
+    @PostMapping(value = "/deletePersonnel")
+    @LogAround(foreignKeys = {"personnelId"},foreignKeyTypes = {"人员"})
+    public Map<String, Object> deletePersonnel(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.deletePersonnel(map);
     }
 
     @ApiOperation(value="更新人员信息", notes="根据rmsMaterial对象创建")
     @ApiImplicitParam(name = "rmsPersonnel", value = "详细实体rmsPersonnel", required = true, dataType = "rmsPersonnel")
     @PostMapping(value = "/updatePersonnel")
+    @LogAround(foreignKeys = {"personnelId"},foreignKeyTypes = {"人员"})
     public Map<String, Object> updatePersonnel(@RequestBody(required = false) Map<String, Object> map){
         return rmsFeign.updatePersonnel(map);
     }
+
     @ApiOperation(value="根据id更新详细人员信息", notes="根据rmsPersonnel对象创建")
     @ApiImplicitParam(name = "rmsPersonnel", value = "详细实体rmsPersonnel", required = true, dataType = "rmsPersonnel")
     @PostMapping(value = "/getPersonnelById/{personnelId}")
@@ -233,7 +285,6 @@ public class RMScontroller extends BaseRESTfulController {
 
 
 
-
     //================公司
     @ApiOperation(value="展示公司信息")
     @ApiImplicitParams({
@@ -637,24 +688,6 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.getOilPriceById(id);
     }
 
-
-    /**
-     * 新增人员权限
-     * @return
-     */
-    @PostMapping("/addPersonnel")
-    public Map<String,Object> addPersonnel(@RequestBody Map<String,Object> map) {
-        return  rmsFeign.addPersonnel(map);
-    }
-
-    /**
-     * 查询SSO主键和机构编码
-     * @return
-     */
-    @PostMapping("/getShipperMap")
-    public Map<String,Object> getShipperMap(@RequestParam Integer shipperId) {
-        return  rmsFeign.getShipperMap(shipperId);
-    }
     //根据运力id查询公司
     @PostMapping(value = "getCarrierNameById/{id}")
     public Map<String,Object> getCarrierNameById(@PathVariable("id") BigDecimal id){
@@ -667,44 +700,6 @@ public class RMScontroller extends BaseRESTfulController {
    }
 
 
-
-    /*
-        txf
-     */
-    @ApiOperation(value="新增组织结构实绩")
-    @PostMapping(value = "/addShipperResult")
-    public Map<String,Object>  addShipperResult(@RequestBody(required = false) Map<String, Object> map){
-        return rmsFeign.addShipperResult(map);
-    }
-
-    @ApiOperation(value="修改组织结构实绩")
-    @PostMapping(value = "/updateShipperResult")
-    public Map<String,Object>  updateShipperResult(@RequestBody(required = false) Map<String, Object> map){
-        return rmsFeign.updateShipperResult(map);
-    }
-
-    @ApiOperation(value="修改组织结构实绩")
-    @PostMapping(value = "/deleteShipperResult")
-    public Map<String,Object>  deleteShipperResult(@RequestBody(required = false) Map<String, Object> map){
-        return rmsFeign.deleteShipperResult(map);
-    }
-
-    @PostMapping(value = "/getCarrierNameBySSOId")
-    public Map<String,Object> getCarrierNameBySSOId(@RequestParam("carrierSSOId") String carrierSSOId){
-        return rmsFeign.getCarrierNameBySSOId(carrierSSOId);
-    }
-    //边输边查收货客户父节点
-    @PostMapping(value = "getConsigneeFarId")
-    public Map<String,Object> getConsigneeFarId(@RequestParam(value ="state") String state){
-        return rmsFeign.getConsigneeFarId(state);
-    }
-
-    @PostMapping("/isInHere")
-    public Integer isInHere(@RequestParam String personnelJobNumber) {
-        return rmsFeign.isInHere(personnelJobNumber);
-    }
-
-
     @ApiOperation(value="创建", notes="添加油品名称")
     @ApiImplicitParam(name = "oilTypeName", value = "油品名称", required = true, dataType = "String")
     @PostMapping(value = "/addOilType")
@@ -724,15 +719,6 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.deleteCapacityCarrier(map!=null?map:new HashMap<>());
     }
 
-    @ApiOperation("罗棒的")
-    @PostMapping("/getInwardContractMaterial")
-    public RESTfulResult getInwardContractMaterial(@RequestBody(required = false) Map<String,Object> map,
-                                                   Integer apiId,
-                                                   Integer pageNum,
-                                                   Integer pageSize,
-                                                   String con){
-        return rmsFeign.getInwardContractMaterial(map!=null?map:new HashMap<>(),apiId,pageNum,pageSize,con);
-    }
 
     @ApiOperation("渲染运力修改数据")
     @PostMapping("/getCapacityInfoById/{id}")
@@ -740,50 +726,6 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.getCapacityInfoById(id);
     }
 
-   //获取货权转移送达单位列表
-    @PostMapping(value = "/getCargoDep")
-    public Map<String,Object> getCargoDep(@RequestBody(required = false) Map<String, Object> mapValue,
-                                     Integer apiId,
-                                     Integer pageNum,
-                                     Integer pageSize,
-                                     String con){
-        if (mapValue==null){
-            mapValue=new HashMap<>();
-        }
-        return rmsFeign.getCargoDep(mapValue,apiId,pageNum,pageSize,con);
-    }
-    //删除货权转移送达单位
-    @PostMapping(value = "/deleteCargoDep")
-    public Map<String, Object> deleteCargoDep(@RequestBody(required = false) Map<String,Object> map){
-        return rmsFeign.deleteCargoDep(map);
-    }
-    @PostMapping(value = "/getCargoDepById/{id}")
-    public Map<String,Object> getCargoDepById(@PathVariable("id") BigDecimal id){
-        return rmsFeign.getCargoDepById(id);
-    }
-
-    //更新货权转移送达单位
-    @PostMapping(value = "/updateCargoDep")
-    public Map<String, Object> updateCargoDep(@RequestBody(required = false) Map<String,Object> map){
-        return rmsFeign.updateCargoDep(map);
-    }
-
-    //新增货权转移送达单位
-    @PostMapping(value = "/insertCargoDep")
-    public Map<String, Object> insertCargoDep(@RequestBody(required = false) Map<String,Object> map){
-        return rmsFeign.insertCargoDep(map);
-    }
-
-
-    //收货客户注册
-    @PostMapping(value = "/signConsignee")
-    public Map<String, Object> signConsignee(@RequestBody Map<String,Object> mapVal){
-        return rmsFeign.signConsignee(mapVal);
-    }
-
-
-
-
     @ApiOperation(value = "查询运力类型")
     @PostMapping("/getCapacityType")
     public Map<String, Object> getCapacityType(@RequestBody(required = false) Map<String,Object> map,

+ 1 - 1
src/main/java/com/steerinfo/dil/controller/TMSController.java

@@ -1,6 +1,6 @@
 package com.steerinfo.dil.controller;
 
-import com.steerinfo.dil.config.ImageFileUtils;
+
 import com.steerinfo.dil.feign.TmsFeign;
 import com.steerinfo.dil.mapper.UniversalMapper;
 import com.steerinfo.dil.util.BaseRESTfulController;

+ 14 - 69
src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -55,74 +55,34 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiModelProperty(value = "边输边查公司单位")
     @PostMapping("/getCompanyMesByLike")
-    public RESTfulResult getSupplierMesByLike(@RequestParam("index") String index) {
+    public RESTfulResult getCompanyMesByLike(@RequestParam("index") String index) {
         List<Map<String, Object>> list = universalMapper.getCompanyMesByLike(index == null ? "" : index);
         return success(list);
     }
 
-
-
-    @ApiOperation("获取图片通用方法")
-    @PostMapping("/getPicture")
-    public List<String> getPicture(@RequestBody(required = false) Map<String,Object> map) throws Exception {
-        try{
-            List<String> results=new ArrayList<>();
-            String urls = map.get("urls").toString();
-            String files[]=urls.split(";");
-            for(int i=0;i<files.length && files[i].length()>5;i++){
-                results.add((String)imageFileUtils.downloadFile(files[i]));
-            }
-            return results;
-        }catch (Exception e){
-            return null;
-        }
-    }
-
-    @ApiOperation("获取图片通用方法")
-    @GetMapping("/getFile")
-    public RESTfulResult getFile(@RequestParam("path") String path, HttpServletResponse response) throws Exception {
-            try {
-                File file = new File(path);
-                if(file.isDirectory()){
-                    return failed("该路径是文件夹而非文件!");
-                }
-                FileInputStream inputStream = new FileInputStream(path);
-                byte[] data = new byte[inputStream.available()];
-                inputStream.read(data);
-                response.setCharacterEncoding("UTF-8");
-                response.setContentType("application/octet-stream;charset=UTF-8");
-                String diskfilename = URLEncoder.encode(file.getName(),"UTF-8") ;
-                response.setHeader("Content-Disposition", "attachment; filename=\"" + diskfilename + "\"");
-                response.setContentLength(data.length);
-                response.setHeader("Content-Range", "" + Integer.valueOf(data.length - 1));
-                response.setHeader("Accept-Ranges", "bytes");
-                OutputStream os = response.getOutputStream();
-                os.write(data);
-                //先声明的流后关掉!
-                os.flush();
-                os.close();
-                inputStream.close();
-            } catch (Exception e) {
-                e.printStackTrace();
-                return failed("未知异常!",e.getMessage());
-            }
-            return success("成功!");
+    @ApiModelProperty(value = "边输边查环保标准")
+    @PostMapping("/getEmissionStandardByLike")
+    public RESTfulResult getEmissionStandardByLike(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getEmissionStandardByLike(index == null ? "" : index);
+        return success(list);
     }
 
-    @ApiOperation("上传图片通用方法,返回成功后的url")
-    @PostMapping("/uploadPic")
-    public String getPicture(MultipartRequest request) throws Exception {
-        //添加到files数组
+    @ApiOperation("上传文件通用方法,返回成功后的url")
+    @PostMapping("/uploadFile")
+    public String uploadFile(MultipartRequest request) throws Exception {
+        //添加到files数组,单次最大允许100
         List<MultipartFile> files = new ArrayList<>();
-        for(int i=0;i<21;i++){
+        for(int i=0;i<100;i++){
             MultipartFile file = request.getFile("file"+i);
             if(file!=null){
                 files.add(file);
+            }else{
+                break;
             }
         }
         //没有上传
         if(files.size() == 0){
-            return  null;
+            return  "";
         }
         //上传图片,拼接在一个url里
         String url="";
@@ -157,19 +117,4 @@ public class UniversalController extends BaseRESTfulController {
     public String getWlUrl() {
         return universalMapper.getWlUrl();
     }
-
-    @GetMapping("/getAllGatepost")
-    public List<Map<String, Object>> getAllGatepost() {
-        return universalMapper.getAllGatepost();
-    }
-
-    @GetMapping("/getAllCalculateMes")
-    public List<Map<String, Object>> getAllCalculateMes() {
-        return universalMapper.getAllCalculateMes();
-    }
-
-    @GetMapping("/getAllWareHouse")
-    public List<Map<String, Object>> getAllWareHouse() {
-        return universalMapper.getAllWareHouse();
-    }
 }

+ 22 - 2
src/main/java/com/steerinfo/dil/feign/RmsFeign.java

@@ -136,11 +136,31 @@ public interface RmsFeign {
     Map<String, Object> getMaterialById(@PathVariable("id") BigDecimal id);
 
 
+    //==============作业点
+    //查询作业点List
+    @PostMapping(value = "api/v1/rms/rmsoperationpoint/getOperationPointList")
+    Map<String,Object> getOperationPointList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                       @RequestParam("apiId") Integer apiId,
+                                       @RequestParam("pageNum") Integer pageNum,
+                                       @RequestParam("pageSize") Integer pageSize);
+    //新增作业点
+    @PostMapping(value = "api/v1/rms/rmsoperationpoint/insertOperationPoint")
+    Map<String, Object> insertOperationPoint(@RequestBody(required = false) Map<String, Object> map);
+    //删除作业点
+    @PostMapping(value = "api/v1/rms/rmsoperationpoint/deleteOperationPoint")
+    Map<String, Object> deleteOperationPoint(@RequestBody(required = false) Map<String, Object> map);
+    //更新作业点信息
+    @PostMapping(value = "api/v1/rms/rmsoperationpoint/updateOperationPoint")
+    Map<String, Object> updateOperationPoint(@RequestBody(required = false) Map<String, Object> map);
+    //查询作业点ID
+    @PostMapping(value = "api/v1/rms/rmsoperationpoint/getOperationPointById/{id}")
+    Map<String, Object> getOperationPointById(@PathVariable("id") BigDecimal id);
+
     //人员管理
     @PostMapping(value = "api/v1/rms/rmspersonnel/insertPersonnel")
     Map<String, Object> insertPersonnel(@RequestBody(required = false) Map<String, Object> map);
-    @PostMapping(value = "api/v1/rms/rmspersonnel/deletePersonnel/{id}")
-    Map<String, Object> deletePersonnel(@PathVariable("id") BigDecimal id);
+    @PostMapping(value = "api/v1/rms/rmspersonnel/deletePersonnel")
+    Map<String, Object> deletePersonnel(@RequestBody(required = false) Map<String, Object> map);
     @PostMapping(value = "api/v1/rms/rmspersonnel/updatePersonnel")
     Map<String, Object> updatePersonnel(@RequestBody(required = false) Map<String, Object> map);
     @PostMapping(value = "api/v1/rms/rmspersonnel/getPersonnelById/{personnelId}")

+ 2 - 8
src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -19,14 +19,6 @@ public interface UniversalMapper {
     //边输边查发货单位
     List<Map<String, Object>> getCompanyMesByLike(String index);
 
-    //查询所有的门岗(下拉框)
-    List<Map<String, Object>> getAllGatepost();
-
-    //查询所有的汽车衡(下拉框)
-    List<Map<String, Object>> getAllCalculateMes();
-
-    //查询所有的仓库(下拉框)
-    List<Map<String, Object>> getAllWareHouse();
 
     List<String> getColumnNoRoutList(Map<String, Object> map);
 
@@ -39,4 +31,6 @@ public interface UniversalMapper {
     List<Map<String, Object>> getColumnAllScheme(Map<String, Object> map);
 
     String getWlUrl();
+
+    List<Map<String, Object>> getEmissionStandardByLike(String s);
 }

+ 0 - 4
src/main/resources/application-dev.yml

@@ -57,10 +57,6 @@ openfeign:
   OTMSFeign:
     url: ${OTMSFEIGN_URL:localhost:8038}
 
-#前缀
-prefix:
-  logPrefix: E:\logs\log\running.log.
-  picPrefix: E:\picture
 
 #远程调用
 feign:

+ 0 - 6
src/main/resources/application-prod.yml

@@ -41,12 +41,6 @@ openfeign:
   OTMSFeign:
     url: ${OTMSFEIGN_URL:localhost:8038}
 
-#前缀
-prefix:
-  logPrefix: E:\logs\log\running.log.
-#  logPrefix: \data\antai-api\running.log.
-  picPrefix: E:\logs\file
-#  picPrefix: \data\file
 
 #远程调用
 feign:

+ 9 - 1
src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
@@ -39,3 +39,11 @@ mybatis:
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
 
+#文件保存路径
+filePath: \data\file
+#前缀
+prefix:
+  logPrefix: E:\logs\log\running.log.
+  #  logPrefix: \data\antai-api\running.log.
+  filePrefix: \data\file
+#  filePrefix: http://172.16.90.214

+ 14 - 1
src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -109,11 +109,24 @@
         select
             RC.COMPANY_ID "companyId",
             RC.COMPANY_NAME "value",
-            RC.COMPANY_NAME "companyName"
+            RC.COMPANY_NAME "companyName",
+            RC.SSO_ID "ssoId",
+            RC.SSO_CODE "ssoCode"
         from RMS_COMPANY RC
         where instr(RC.COMPANY_NAME, #{index}) > 0
         and DELETED = 0
         order by RC.COMPANY_ID
         FETCH NEXT 10 ROWS ONLY
     </select>
+    <select id="getEmissionStandardByLike" resultType="java.util.Map">
+        select
+            EMISSION_STANDARD_ID "emissionStandardId",
+            EMISSION_STANDARD_NAME "emissionStandardName",
+            EMISSION_STANDARD_ID "value",
+            EMISSION_STANDARD_NAME "label"
+        from RMS_EMISSION_STANDARD
+        where instr(EMISSION_STANDARD_NAME, #{index}) > 0
+        and DELETED = 0
+        FETCH NEXT 10 ROWS ONLY
+    </select>
 </mapper>