用友接口

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

@@ -5,6 +5,7 @@ import com.platform.common.validation.group.UpdateGroup;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 import javax.validation.constraints.*;
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -22,82 +23,82 @@ import java.math.BigDecimal;
 @EqualsAndHashCode(callSuper = true)
 public class RemoteDegreeDTO extends BaseDTO implements Serializable {
 
-      /**
+    /**
      * id
      */
-        @NotNull(groups = {UpdateGroup.class}, message = "ID不能为空")
+    @NotNull(groups = {UpdateGroup.class}, message = "ID不能为空")
     private String id;
-          /**
+    /**
      * 设备id
      */
-          private String sbId;
-          /**
+    private String sbId;
+    /**
      * 设备名称
      */
-          private String sbName;
-          /**
+    private String sbName;
+    /**
      * 点位
      */
-          private Integer positionNum;
-          /**
+    private Integer positionNum;
+    /**
      * 类型
      */
-          private Integer type;
-          /**
+    private Integer type;
+    /**
      * 描述
      */
-          private String desc;
-          /**
+    private String desc;
+    /**
      * 实时数值
      */
-          private String value;
-          /**
+    private String result;
+    /**
      * 系数
      */
-          private BigDecimal ratio;
-          /**
+    private BigDecimal ratio;
+    /**
      * 单位
      */
-          private String unit;
-          /**
+    private String unit;
+    /**
      * 备注
      */
-          private String remark;
-          /**
+    private String remark;
+    /**
      * 创建人
      */
-          private String createdUserId;
-          /**
+    private String createdUserId;
+    /**
      * 更新人
      */
-          private String updateUserId;
-          /**
+    private String updateUserId;
+    /**
      * 创建日期
      */
-        private LocalDateTime createdTime;
-      /**
-       * 创建日期开始
-       */
-      private LocalDateTime createdTimeStart;
-      /**
-       * 创建日期结束
-       */
-      private LocalDateTime createdTimeEnd;
-          /**
+    private LocalDateTime createdTime;
+    /**
+     * 创建日期开始
+     */
+    private LocalDateTime createdTimeStart;
+    /**
+     * 创建日期结束
+     */
+    private LocalDateTime createdTimeEnd;
+    /**
      * 更新日期
      */
-        private LocalDateTime updateTime;
-      /**
-       * 更新日期开始
-       */
-      private LocalDateTime updateTimeStart;
-      /**
-       * 更新日期结束
-       */
-      private LocalDateTime updateTimeEnd;
-        /**
+    private LocalDateTime updateTime;
+    /**
+     * 更新日期开始
+     */
+    private LocalDateTime updateTimeStart;
+    /**
+     * 更新日期结束
+     */
+    private LocalDateTime updateTimeEnd;
+    /**
      * 关键字
      */
-  private String keyword;
+    private String keyword;
 
 }

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

@@ -50,7 +50,7 @@ public class RemoteDegreeLogDTO extends BaseDTO implements Serializable {
           /**
      * 实时数值
      */
-          private String value;
+          private String result;
           /**
      * 系数
      */

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

@@ -50,7 +50,7 @@ public class RemoteMeasureDTO extends BaseDTO implements Serializable {
           /**
      * 实时数值
      */
-          private String value;
+          private String result;
           /**
      * 系数
      */

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

@@ -51,7 +51,7 @@ public class RemoteDegree implements Serializable{
     /**
      * 实时数值
      */
-    private String value;
+    private String result;
     /**
      * 系数
      */

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

@@ -51,7 +51,7 @@ public class RemoteDegreeLog implements Serializable{
     /**
      * 实时数值
      */
-    private String value;
+    private String result;
     /**
      * 系数
      */

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

@@ -51,7 +51,7 @@ public class RemoteMeasure implements Serializable{
     /**
      * 实时数值
      */
-    private String value;
+    private String result;
     /**
      * 系数
      */

platform-dao/src/main/java/com/platform/dao/util/CustomExcelImportUtil.java

@@ -466,21 +466,19 @@ public class CustomExcelImportUtil {
     }
 
     public static void main(String[] args) throws IOException, InvalidFormatException {
-        //String path = "C:\\Users\\cyz\\Downloads\\老版维保计划\\noperson";
-        //File dirFile = new File("C:\\Users\\cyz\\Downloads\\老版维保计划\\noperson");
-        String[] files = {"C:\\Users\\LTKJ\\Downloads\\2022.1.28保养任务 终版 导入.xls"};
+        String[] files = {"E:\\项目\\龙岩思康\\设备管理\\信息表-时代思康电量数据上送项目-电度.xlsx"};
         DateUtils.strToLocalDate("2022-09-23", DateUtils.PATTERN_YMD);
-        /*for(String fileStr:files){
+        for(String fileStr:files){
             System.out.println(fileStr);
             InputStream inputstream = new FileInputStream(fileStr);
             LocalDateTime now = LocalDateTime.now();
             //List<SbInfoVO> list = importSbInfoList(inputstream);
-            List<CheckJob> list = importCheckJobList(inputstream);
+            List<RemoteDegree> list = importRemoteDegreeList(inputstream, null);
             list.forEach(item -> {
                 System.out.println(item.toString());
             });
             System.out.println("处理数量：" + list.size());
-        }*/
+        }
     }
 
     public static List<SbModel> importModelList(InputStream inputstream) throws IOException, InvalidFormatException {
@@ -994,27 +992,28 @@ public class CustomExcelImportUtil {
                 continue;
             }
 
-            String index = row.getCell(0).getStringCellValue() + "";
+            String index = getCellValue(row.getCell(0)) + "";
             try {
                 //i,j i:行 j:列
+                record.setId(IdGeneratorUtils.getObjectId());
                 record.setPositionNum(Integer.valueOf(getCellValue(row.getCell(0))));
                 record.setSbName(getCellValue(row.getCell(1)));
-                record.setDesc(StringUtils.getExcelString(row.getCell(2)));
-                String type = getCellValue(row.getCell(3)).trim();
-                if(StringUtils.isNotEmpty(type)){
+                String desc = getCellValue(row.getCell(2)).trim();
+                record.setDesc(desc);
+                if(StringUtils.isNotEmpty(desc)){
                     boolean find = false;
                     for(SysDict sysDict: sysDictList){
-                        if(sysDict.getLabel().equals(type)){
+                        if(sysDict.getLabel().equals(desc)){
                             record.setType(Integer.valueOf(sysDict.getValue()));
                             find = true;
                             break;
                         }
                     }
                     if(!find){
-                        throw new BusinessException("点位类型未配置，请配置数据字典：" + type );
+                        throw new BusinessException("点位类型未配置，请配置电度数据字典：" + desc );
                     }
                 }
-                record.setUnit(getCellValue(row.getCell(4)).trim());
+                record.setUnit(getCellValue(row.getCell(3)).trim());
             } catch (Exception e) {
                 e.printStackTrace();
                 error.append(index).append("错误地址：第"+i+"行");
@@ -1066,24 +1065,25 @@ public class CustomExcelImportUtil {
             String index = row.getCell(0).getStringCellValue() + "";
             try {
                 //i,j i:行 j:列
+                record.setId(IdGeneratorUtils.getObjectId());
                 record.setPositionNum(Integer.valueOf(getCellValue(row.getCell(0))));
                 record.setSbName(getCellValue(row.getCell(1)));
-                String desc = getCellValue(row.getCell(2)).trim();
-                record.setDesc(desc);
-                if(StringUtils.isNotEmpty(desc)){
+                record.setDesc(StringUtils.getExcelString(row.getCell(2)));
+                String type = getCellValue(row.getCell(3)).trim();
+                if(StringUtils.isNotEmpty(type)){
                     boolean find = false;
                     for(SysDict sysDict: sysDictList){
-                        if(sysDict.getLabel().equals(desc)){
+                        if(sysDict.getLabel().equals(type)){
                             record.setType(Integer.valueOf(sysDict.getValue()));
                             find = true;
                             break;
                         }
                     }
                     if(!find){
-                        throw new BusinessException("点位类型未配置，请配置电度数据字典：" + desc );
+                        throw new BusinessException("点位类型未配置，请配置数据字典：" + type );
                     }
                 }
-                record.setUnit(getCellValue(row.getCell(3)).trim());
+                record.setUnit(getCellValue(row.getCell(4)).trim());
             } catch (Exception e) {
                 e.printStackTrace();
                 error.append(index).append("错误地址：第"+i+"行");

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

@@ -50,7 +50,7 @@ public class RemoteDegreeLogVO extends BaseVO implements Serializable{
         /**
      * 实时数值
      */
-        private String value;
+        private String result;
         /**
      * 系数
      */

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

@@ -50,7 +50,7 @@ public class RemoteDegreeVO extends BaseVO implements Serializable{
         /**
      * 实时数值
      */
-        private String value;
+        private String result;
         /**
      * 系数
      */

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

@@ -50,7 +50,7 @@ public class RemoteMeasureVO extends BaseVO implements Serializable{
         /**
      * 实时数值
      */
-        private String value;
+        private String result;
         /**
      * 系数
      */

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

@@ -8,7 +8,7 @@
                                      degree-log.position_num,
                                      degree-log.type,
                                      degree-log.desc,
-                                     degree-log.value,
+                                     degree-log.result,
                                      degree-log.ratio,
                                      degree-log.unit,
                                      degree-log.remark,
@@ -23,7 +23,7 @@
                                      degree-log.position_num,
                                      degree-log.type,
                                      degree-log.desc,
-                                     degree-log.value,
+                                     degree-log.result,
                                      degree-log.ratio,
                                      degree-log.unit,
                                      degree-log.remark,
@@ -47,8 +47,8 @@
                                                 <if test="desc != null and desc != ''">
                     and degree-log.desc = #{desc}
                 </if>
-                                                <if test="value != null and value != ''">
-                    and degree-log.value = #{value}
+                                                <if test="result != null and result != ''">
+                    and degree-log.result = #{result}
                 </if>
                                                 <if test="ratio != null">
                     and degree-log.ratio = #{ratio}

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

@@ -8,7 +8,7 @@
                                      degree.position_num,
                                      degree.type,
                                      degree.desc,
-                                     degree.value,
+                                     degree.result,
                                      degree.ratio,
                                      degree.unit,
                                      degree.remark,
@@ -23,7 +23,7 @@
                                      degree.position_num,
                                      degree.type,
                                      degree.desc,
-                                     degree.value,
+                                     degree.result,
                                      degree.ratio,
                                      degree.unit,
                                      degree.remark,
@@ -47,8 +47,8 @@
                                                 <if test="desc != null and desc != ''">
                     and degree.desc = #{desc}
                 </if>
-                                                <if test="value != null and value != ''">
-                    and degree.value = #{value}
+                                                <if test="result != null and result != ''">
+                    and degree.result = #{result}
                 </if>
                                                 <if test="ratio != null">
                     and degree.ratio = #{ratio}

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

@@ -8,7 +8,7 @@
                                      measure.position_num,
                                      measure.type,
                                      measure.desc,
-                                     measure.value,
+                                     measure.result,
                                      measure.ratio,
                                      measure.unit,
                                      measure.remark,
@@ -23,7 +23,7 @@
                                      measure.position_num,
                                      measure.type,
                                      measure.desc,
-                                     measure.value,
+                                     measure.result,
                                      measure.ratio,
                                      measure.unit,
                                      measure.remark,
@@ -47,8 +47,8 @@
                                                 <if test="desc != null and desc != ''">
                     and measure.desc = #{desc}
                 </if>
-                                                <if test="value != null and value != ''">
-                    and measure.value = #{value}
+                                                <if test="result != null and result != ''">
+                    and measure.result = #{result}
                 </if>
                                                 <if test="ratio != null">
                     and measure.ratio = #{ratio}

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

@@ -78,14 +78,11 @@ public class RemoteDegreeServiceImpl extends BaseServiceImpl<RemoteDegreeMapper,
         try {
             List<RemoteDegree> items = CustomExcelImportUtil.importRemoteDegreeList(file.getInputStream(),sysDictList);
             if (!CollectionUtils.isEmpty(items)) {
-                List<RemoteDegree> addItems = new ArrayList<RemoteDegree>();
-                if (!CollectionUtils.isEmpty(addItems)) {
-                    List<SbInfo> itemsAdd = BeanConverterUtil.copyListProperties(addItems, SbInfo.class);
-                    mapper.insertListforComplex(addItems);
-                }
+                mapper.insertListforComplex(items);
             }
             return "总计新增导入：" + (items.size());
         } catch (Exception e) {
+            e.printStackTrace();
             throw new BusinessException(e.getMessage());
         }
     }

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

@@ -70,14 +70,11 @@ public class RemoteMeasureServiceImpl extends BaseServiceImpl<RemoteMeasureMappe
         try {
             List<RemoteMeasure> items = CustomExcelImportUtil.importRemoteMeasureList(file.getInputStream(),sysDictList);
             if (!CollectionUtils.isEmpty(items)) {
-                List<RemoteMeasure> addItems = new ArrayList<RemoteMeasure>();
-                if (!CollectionUtils.isEmpty(addItems)) {
-                    List<SbInfo> itemsAdd = BeanConverterUtil.copyListProperties(addItems, SbInfo.class);
-                    mapper.insertListforComplex(addItems);
-                }
+                mapper.insertListforComplex(items);
             }
             return "总计新增导入：" + (items.size());
         } catch (Exception e) {
+            e.printStackTrace();
             throw new BusinessException(e.getMessage());
         }
     }