同步1.0版本

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/controller/AlarmCountController.java

@@ -205,8 +205,13 @@ public class AlarmCountController {
         try {
             List<AlarmStat1> result = new ArrayList<>();
             List<AlarmStat1> alarmStat1s = alarmCountService.statAlarmCount1(stId, startDate, endDate);
-            if(alarmStat1s!=null)
+            if(alarmStat1s!=null){
+                for(AlarmStat1 alarmStat1:alarmStat1s){
+                    Windturbine windturbine = windturbineService.selectWindturbineByWindturbineid(alarmStat1.getWindturbineId());
+                    alarmStat1.setCode(windturbine.getCode());
+                }
                 result.addAll(alarmStat1s);
+            }
 
             //添加拦截,查询液压泵运行统计,并将结果合并为 List<AlarmStat1>
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/controller/DeviceController.java

@@ -231,6 +231,19 @@ public class DeviceController {
         return deviceService.getDeviceModelList();
     }
 
+    @ApiOperation("风机型号分页查询")
+    @GetMapping(value = "/model/page")
+    public ResponseWrapper queryByPage(
+            @ApiParam(value = "当前页") @RequestParam(value = "pagenum") Integer pageNum,
+            @ApiParam(value = "分页大小") @RequestParam(value = "pagesize") Integer pageSize,
+            @ApiParam(value = "风机型号") @RequestParam(value = "code", required = false) String code,
+            @ApiParam(value = "场站名称") @RequestParam(value = "stationname", required = false) String stationname
+    ) {
+        Page<DeviceModel> page = new Page(pageNum, pageSize);
+        IPage<DeviceModel> pageResult = deviceService.pageQueryDeviceModel(page, code,stationname);
+        return ResponseWrapper.success("请求成功",pageResult);
+    }
+
     @GetMapping(value = "/model/{id}")
     public List<DeviceModel> getDeviceModelsById(@PathVariable("id")  String id) {
         return deviceService.getDeviceModelsById(id);
@@ -287,6 +300,34 @@ public class DeviceController {
         return wrapper;
     }
 
+    @ApiOperation("将文件数据转化为json")
+    @PostMapping(value ="/conversion")
+    @ResponseBody
+    public ResponseWrapper<DeviceMetrics> converSion(@ApiParam(value = "导入文件") @RequestParam("file") MultipartFile file){
+        ResponseWrapper<DeviceMetrics> wrapper = null;
+        if (!file.isEmpty()) {
+            try {
+                String originalFilename = file.getOriginalFilename();
+                String fileType = originalFilename.substring(originalFilename.lastIndexOf(".") + 1, originalFilename.length());
+                Integer startRows = 1;
+                InputStream is = file.getInputStream();
+                List<DeviceMetrics> bindingList = new ArrayList<>();
+                List<String[]> strings = ExcelUtil.readData(fileType, startRows, true, is);
+                for (String[] str : strings) {
+                    DeviceMetrics deviceMetrics = new DeviceMetrics();
+                    deviceMetrics.setDeviceid(str[0]);
+                    deviceMetrics.setName(str[1]);
+                    deviceMetrics.setDescription(str[2]);
+                    deviceMetrics.setEnname(str[3]);
+                    bindingList.add(deviceMetrics);
+                }
+                wrapper = ResponseWrapper.success("转化成功",bindingList);
+            }catch (IOException e) {
+                wrapper = ResponseWrapper.error("转化失败");
+            }
+        }
+        return wrapper;
+    }
 
     //@RequestMapping("input")
     @PostMapping(value ="/input")

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/controller/FaultInfoController.java

@@ -212,10 +212,10 @@ public class FaultInfoController {
             @RequestParam(value = "faultHistoryId") long faultHistoryId,
             @RequestParam(value = "confirmType") int confirmType,
             @RequestParam(value = "userName") String userName,
-            @RequestParam(value = "snpaId") long snpaId) {
+            @RequestParam(value = "snapId") long snapId) {
 
         try {
-            faultService.confirmBatch(faultHistoryId,confirmType,userName,snpaId);
+            faultService.confirmBatch(faultHistoryId,confirmType,userName,snapId);
         } catch (Exception e) {
             logger.error("操作失败",e);
         }

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/controller/InfoController.java

@@ -8,11 +8,13 @@ import com.gyee.wisdom.alarm.sharding.RSA.RSAService;
 import com.gyee.wisdom.alarm.sharding.entity.*;
 import com.gyee.wisdom.alarm.sharding.mapper.*;
 import com.gyee.wisdom.alarm.sharding.service.DeviceService;
+import com.gyee.wisdom.alarm.sharding.service.WindturbineService;
 import com.gyee.wisdom.alarm.sharding.util.ResponseWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.digest.DigestUtils;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -40,7 +42,7 @@ public class InfoController {
     private WindPowerStationMapper windPowerStationMapper;
 
     @Autowired
-    private WindturbineMapper windturbineMapper;
+    private WindturbineService windturbineService;
 
     @Autowired
     private TestingPointAIMapper testingPointAIMapper;
@@ -90,10 +92,11 @@ public class InfoController {
     }
 
 
+    @ApiOperation("根据场站名称查询所有风机编号")
     @RequestMapping(value = "/windturbine")
     @ResponseBody
-    public List<Windturbine> getWindturbineByStation(@RequestParam(value = "stationId", required = false) String stationId) {
-        List<Windturbine> lst = windturbineMapper.selectWindturbineByCondition2(stationId);
+    public List<Windturbine> getWindturbineByStation( @ApiParam(value = "场站名称") @RequestParam(value = "stationId", required = false) String stationId) {
+        List<Windturbine> lst = windturbineService.selectWindturbineByStationid(stationId);
         return lst;
     }
 

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/controller/ScadabjController.java

@@ -145,9 +145,7 @@ public class ScadabjController {
                     scadabj.setRank(str[8]);
                     scadabj.setAlarmType(Integer.parseInt(str[9]));
                     scadabj.setEnabled(Integer.parseInt(str[10]));
-                    if(str.length==12){
-                        scadabj.setDeviceId(str[11]);
-                    }
+                    scadabj.setDeviceId(str[11]);
                     bindingList.add(scadabj);
                 }
                 for (Scadabj scadabj : bindingList) {

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/entity/AlarmStat1.java

@@ -23,4 +23,6 @@ public class AlarmStat1 implements Serializable{
     //关联部件名称
     private String relatePartsText;
 
+    private String code;
+
 }

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/entity/DeviceModel.java

@@ -1,5 +1,8 @@
 package com.gyee.wisdom.alarm.sharding.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -8,23 +11,29 @@ import java.io.Serializable;
  * 设备型号
  */
 @Data
+@TableName("device_model")
 public class DeviceModel implements Serializable{
 
+    @TableId("id")
     private int id;
-
+    @TableField("code")
     private String code;
-
+    @TableField("deviceid")
     private String deviceid;
-
+    @TableField("name")
     private String name;
-
+    @TableField("enname")
     private String enname;
-
+    @TableField("description")
     private String description;
-
+    @TableField("orderno")
     private int orderno;
-
+    @TableField("enabled")
     private boolean enabled;
+    @TableField("stationname")
+    private String stationname;
+    @TableField("stationid")
+    private String stationid;
 
 //    ID                   NUMBER               not null,
 //    DEVICEID             VARCHAR2(50)         default '1' not null,

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/service/DeviceService.java

@@ -2,6 +2,7 @@ package com.gyee.wisdom.alarm.sharding.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
@@ -10,6 +11,7 @@ import com.gyee.wisdom.alarm.sharding.entity.*;
 import com.gyee.wisdom.alarm.sharding.mapper.*;
 import com.gyee.wisdom.alarm.sharding.model.TreeNode;
 import com.gyee.wisdom.alarm.sharding.util.SnowflakeGenerator;
+import com.gyee.wisdom.alarm.sharding.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -452,4 +454,12 @@ public class DeviceService {
 
     }
 
+    public IPage<DeviceModel> pageQueryDeviceModel(Page<DeviceModel> page, String code, String stationname) {
+        QueryWrapper<DeviceModel> wrapper = new QueryWrapper<>();
+        if (StringUtil.isNotBlank(code))
+            wrapper.like("code", code);
+        if (StringUtil.isNotBlank(stationname))
+            wrapper.like("stationname", stationname);
+        return deviceModelMapper.selectPage(page, wrapper);
+    }
 }

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/service/WindturbineService.java

@@ -10,7 +10,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * @author Wang Jiawen
@@ -28,4 +30,38 @@ public class WindturbineService extends ServiceImpl<WindturbineMapper, Windturbi
       public List<Windturbine> selectByExample(WindturbineExample example) {
         return windturbineMapper.selectByExample(example);
     }
+
+    public List< Windturbine> selectWindturbineByStationid(String stationId) {
+        List<Windturbine> lst = windturbineMapper.selectWindturbineByCondition2(stationId);
+        Map<Integer, Windturbine> map = new HashMap<>();
+        if (lst.size()<=0) {
+            return lst;
+        }
+        for(int i = 0;i<lst.size();i++) {
+            String s = lst.get(i).getName();
+            String regEx = "[^0-9]";
+            Pattern p = Pattern.compile(regEx);
+            Matcher m = p.matcher(s);
+            String trim = m.replaceAll("").trim();
+            int i1 = Integer.parseInt(trim);
+            map.put(i1,lst.get(i));
+        }
+        List<Map.Entry<Integer, Windturbine>> entryList1 = new ArrayList<Map.Entry<Integer, Windturbine>>(map.entrySet());
+        Collections.sort(entryList1, new Comparator<Map.Entry<Integer, Windturbine>>() {
+            @Override
+            public int compare(Map.Entry<Integer, Windturbine> o1, Map.Entry<Integer, Windturbine> o2) {
+                return o1.getKey().compareTo(o2.getKey()); // 升序排序
+            }
+        });
+        List<Windturbine> list = new ArrayList<>();
+        for (int i = 0;i<entryList1.size();i++){
+            Map.Entry<Integer, Windturbine> maps = entryList1.get(i);
+            list.add(maps.getValue());
+        }
+        return list;
+    }
+
+    public Windturbine selectWindturbineByWindturbineid(String windturbineid) {
+        return windturbineMapper.selectById(windturbineid);
+    }
 }

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/util/ExcelUtil.java

@@ -123,7 +123,7 @@ public class ExcelUtil {
                     continue;
                 }
 
-                int rowSize = row.getLastCellNum();
+                int rowSize = sheet.getRow(0).getLastCellNum();
                 String[] values = new String[rowSize];
                 boolean hasValue = false;
                 for (int columnIndex = 0; columnIndex < rowSize; columnIndex++) {

warning-web/src/main/resources/mappers-oracle/AlarmHistoryMapper.xml

@@ -59,7 +59,10 @@
                 and b.windturbineid=#{wtid}
             </if>
             <if test="category1 !=null and category1 !=''">
-                and b.category1=#{category1}
+                and b.category1 in
+                <foreach item="item" index="index" collection="category1.split(',')"  open="(" separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
             <if test="category2 !=null and category2 !=''">
                 and b.category2=#{category2}
@@ -120,7 +123,10 @@
                 and b.windturbineid=#{wtid}
             </if>
             <if test="category1 !=null and category1 !=''">
-                and b.category1=#{category1}
+                and b.category1 in
+                <foreach item="item" index="index" collection="category1.split(',')"  open="(" separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
             <if test="category2 !=null and category2 !=''">
                 and b.category2=#{category2}