opc优化

platform-dao/src/main/java/com/platform/dao/dto/remote/RemoteOpcDTO.java

@@ -73,7 +73,7 @@ public class RemoteOpcDTO extends BaseDTO implements Serializable {
     /**
      * 线路
      */
-    private Integer line;
+    private String line;
     /**
      * 类型
      */

platform-dao/src/main/java/com/platform/dao/entity/remote/RemoteOpc.java

@@ -73,7 +73,7 @@ public class RemoteOpc implements Serializable {
     /**
      * 线路
      */
-    private Integer line;
+    private String line;
     /**
      * 类型
      */

platform-dao/src/main/java/com/platform/dao/vo/query/remote/RemoteOpcVO.java

@@ -68,9 +68,13 @@ public class RemoteOpcVO extends BaseVO implements Serializable {
      */
     private String positionNum;
     /**
-     * 线路
+     * 所属车间
      */
-    private Integer line;
+    private String line;
+    /**
+     * 所属车间
+     */
+    private String positionName;
     /**
      * 类型
      */

platform-dao/src/main/resources/mapper/remote/RemoteOpcMapper.xml

@@ -125,8 +125,9 @@
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.remote.RemoteOpcDTO"
             resultType="com.platform.dao.vo.query.remote.RemoteOpcVO">
-        select opc.*
+        select opc.*, position.name as positionName
         from t_remote_opc as opc
+        left join t_sb_position position on opc.line = position.id
         <where>
             <include refid="List_Condition"/>
         </where>

platform-rest/src/main/java/com/platform/rest/controller/remote/RemoteOpcController.java

@@ -153,14 +153,14 @@ public class RemoteOpcController {
     }
 
     /**
-     * 新增导入
+     * 新增导入:导入某个车间的，选择车间
      *
      * @param file bom excel文件
      * @return R
      */
     @SysLog("新增opc点位数据导入")
-    @PostMapping("/import")
-    public R importExcel(@RequestParam("file") MultipartFile file, Integer line) throws Exception {
+    @PostMapping("/import/{line}")
+    public R importExcel(@RequestParam("file") MultipartFile file, @PathVariable("line") String line) throws Exception {
         String result = remoteMeasureService.importListByAdd(file, line);
         return new R<>(result);
     }

platform-service/src/main/java/com/platform/service/remote/RemoteOpcService.java

@@ -44,7 +44,7 @@ public interface RemoteOpcService extends IBaseService<RemoteOpc, RemoteOpcDTO>
      */
     void updateResultByPositionNum(Integer positionNum, String result);
 
-    String importListByAdd(MultipartFile file, Integer line);
+    String importListByAdd(MultipartFile file, String line);
 
     void updateIds(List<String> ids, Integer updateType, Integer value);
 }

platform-service/src/main/java/com/platform/service/remote/impl/RemoteOpcServiceImpl.java

@@ -9,6 +9,7 @@ import com.platform.dao.dto.remote.RemoteOpcDTO;
 import com.platform.dao.entity.remote.RemoteOpc;
 import com.platform.dao.entity.sb.SbInfo;
 import com.platform.dao.entity.upms.SysDict;
+import com.platform.dao.enums.YesNoEnum;
 import com.platform.dao.mapper.remote.RemoteOpcMapper;
 import com.platform.dao.mapper.sb.SbInfoMapper;
 import com.platform.dao.mapper.upms.SysDictMapper;
@@ -73,9 +74,9 @@ public class RemoteOpcServiceImpl extends BaseServiceImpl<RemoteOpcMapper, Remot
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String importListByAdd(MultipartFile file, Integer line) {
+    public String importListByAdd(MultipartFile file, String line) {
         if(line == null){
-            line =1;
+            line = "1";
         }
         Weekend<SysDict> weekend = new Weekend<>(SysDict.class);
         WeekendCriteria<SysDict, Object> weekendCriteria = weekend.weekendCriteria();
@@ -89,8 +90,9 @@ public class RemoteOpcServiceImpl extends BaseServiceImpl<RemoteOpcMapper, Remot
                 for (RemoteOpc remoteOpc : items) {
                     remoteOpc.setType(1);
                     remoteOpc.setLine(line);
-                    remoteOpc.setAvFlag(1);
-                    remoteOpc.setCreatedFlag(0);
+                    remoteOpc.setAvFlag(YesNoEnum.YES.getValue());
+                    remoteOpc.setCreatedFlag(YesNoEnum.NO.getValue());
+                    remoteOpc.setPositionFlag(YesNoEnum.NO.getValue());
                    /* boolean find = false;
                     for (SysDict sysDict : sysDictList) {
                         if (sysDict.getLabel().equals(remoteOpc.getRemark())) {