fix

src/main/java/com/gyee/MpGenerator.java

@@ -29,7 +29,7 @@ public class MpGenerator {
     //作者
     private static String authorName = "chenmh";
     //要生成的表名
-    private static String[] tables = {"GYEEVERSION"};
+    private static String[] tables = {""};
     //table前缀
     private static String prefix = "";
 
@@ -37,7 +37,7 @@ public class MpGenerator {
     private static DbType dbType = DbType.SQL_SERVER;
     //数据库配置四要素
     private static String driverName = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
-    private static String url = "jdbc:sqlserver://10.155.32.2:1433;DatabaseName=test";
+    private static String url = "jdbc:sqlserver://192.168.1.82:1433;DatabaseName=fdeam";
 //    private static String driverName = "com.mysql.jdbc.Driver";
 //    private static String url = "jdbc:mysql://localhost:3306/assemb?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false";
     private static String username = "sa";

src/main/java/com/gyee/SqlSeverTicket.java

@@ -20,7 +20,7 @@ public class SqlSeverTicket {
 
         String driverName = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
         //加载JDBC驱动
-        String dbURL = "jdbc:sqlserver://10.155.32.2:1433;DatabaseName=fdeam";
+        String dbURL = "jdbc:sqlserver://192.168.1.82:1433;DatabaseName=fdeam";
         //连接服务器和数据库
         String userName = "sa"; //默认用户名
         String userPwd = "Gyee@321#!"; //密码
@@ -40,11 +40,11 @@ public class SqlSeverTicket {
 
             //        String fileName = "wangbing.png";
 //
-        String filePath1 = "D:/document/两票相关材料/人员电子签名/";
-        String filePath2 = "D:/document/两票相关材料/";
+        String filePath1 = "D:\\document\\图形开票\\两票相关材料\\人员电子签名\\";
+        String filePath2 = "D:\\document\\图形开票\\两票相关材料\\";
 //        batchThumb(filePath1, filePath2);
-//        singleThumb(filePath1, filePath2, "chenl.png");
-        setImage(conn, "D:/document/两票相关材料/chenl.png", "chenl");
+//        singleThumb(filePath1, filePath2, "aisitong.png");
+        setImage(conn, "D:\\document\\图形开票\\两票相关材料\\aisitong.png", "aist");
         } catch (Exception e) {
             e.printStackTrace();
         } finally {

src/main/java/com/gyee/frame/common/quartz/task/monitor_target_matrixMonitor.java

@@ -17,7 +17,7 @@ public class monitor_target_matrixMonitor {
      * @throws Exception 
      */
     public void monitor_target_matrixMonitor() throws Exception {
-        monitorService.monitor_target_matrixMonitor();//调用list方法完成对 key ："weatherProphet_1" ，路径"weather/weatherProphet_1"的推送
+        monitorService.monitor_target_matrixMonitor(null);//调用list方法完成对 key ："weatherProphet_1" ，路径"weather/weatherProphet_1"的推送
         ////System.out.println("我已执行");
     }   
        

src/main/java/com/gyee/frame/controller/app/monitor/MonitorController.java

@@ -4,9 +4,11 @@ import com.gyee.frame.common.dataSources.DataSource;
 import com.gyee.frame.common.dataSources.DataSourceType;
 import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.model.custom.DataVo;
+import com.gyee.frame.model.custom.MatrixVo;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.service.app.index.MonitorDataService;
 import com.gyee.frame.service.app.windpowerstationdetail.WindPowerEchartService;
+import com.gyee.frame.service.monitor.MonitorService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,6 +30,8 @@ public class MonitorController {
     private MonitorDataService monitorDataService;
     @Resource
     private WindPowerEchartService echartService;
+    @Resource
+    private MonitorService monitorService;
 
     /**
      * 安全天数、装机容量、发电量...
@@ -105,4 +109,16 @@ public class MonitorController {
         Map<String, List<DataVo>> map = echartService.index_curve_columnar_five_loss();
         return AjaxResult.successData(map);
     }
+
+
+    /**
+     * 五损柱状图
+     * @return
+     */
+    @DataSource(DataSourceType.MASTER)
+    @GetMapping("/matrix")
+    public AjaxResult getMatrix(String station) throws Exception {
+        List<MatrixVo> matrixVos = monitorService.monitor_target_matrixMonitor(station);
+        return AjaxResult.successData(matrixVos);
+    }
 }

src/main/java/com/gyee/frame/controller/ticket/LoginController.java

@@ -31,7 +31,7 @@ public class LoginController {
      * @return
      */
     @DataSource(value = DataSourceType.TICKET)
-    @PostMapping(value = "sys/vpnlogin")
+    @GetMapping(value = "sys/vpnlogin")
     public AjaxResult vpnLogin(@RequestParam("vpnId") String vpnId){
         System.out.println("=====sys/vpnlogin：" + vpnId);
         Labor labor = laborService.getLaborByVPN(vpnId);
@@ -50,7 +50,7 @@ public class LoginController {
      * @return
      */
     @DataSource(value = DataSourceType.TICKET)
-    @PostMapping(value = "sys/login")
+    @GetMapping(value = "sys/login")
     public AjaxResult login(@RequestParam("username") String username,
                             @RequestParam("password") String password){
         System.out.println("=====sys/login：" + username + "—" + password);

src/main/java/com/gyee/frame/controller/ticket/TicketLogController.java

@@ -0,0 +1,34 @@
+package com.gyee.frame.controller.ticket;
+
+import com.gyee.frame.common.dataSources.DataSource;
+import com.gyee.frame.common.dataSources.DataSourceType;
+import com.gyee.frame.common.domain.AjaxResult;
+import com.gyee.frame.model.ticket.Phonelog;
+import com.gyee.frame.service.ticket.PhonelogService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+@RestController
+@RequestMapping("/log")
+public class TicketLogController {
+
+    @Resource
+    private PhonelogService phonelogService;
+
+    @DataSource(value = DataSourceType.TICKET)
+    @GetMapping("insert")
+    public AjaxResult insert(String labornum, String mac){
+        Phonelog log = new Phonelog();
+        log.setLabornum(labornum);
+        log.setMac(mac);
+        log.setLogtime(new Date());
+        phonelogService.insertLog(log);
+
+        return AjaxResult.success();
+    }
+}

src/main/java/com/gyee/frame/mapper/ticket/PhonelogMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.frame.mapper.ticket;
+
+import com.gyee.frame.model.ticket.Phonelog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author chenmh
+ * @since 2022-09-23
+ */
+public interface PhonelogMapper extends BaseMapper<Phonelog> {
+
+}

src/main/java/com/gyee/frame/model/ticket/Phonelog.java

@@ -0,0 +1,47 @@
+package com.gyee.frame.model.ticket;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author chenmh
+ * @since 2022-09-23
+ */
+@Data
+  @EqualsAndHashCode(callSuper = false)
+    @TableName("PHONELOG")
+public class Phonelog extends Model<Phonelog> {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId("ID")
+      private Long id;
+
+    @TableField("LABORNUM")
+    private String labornum;
+
+    @TableField("MAC")
+    private String mac;
+
+    @TableField("LOGTIME")
+    private Date logtime;
+
+
+    @Override
+    protected Serializable pkVal() {
+          return this.id;
+      }
+
+}

src/main/java/com/gyee/frame/service/impl/ticket/PhonelogServiceImpl.java

@@ -0,0 +1,27 @@
+package com.gyee.frame.service.impl.ticket;
+
+import com.gyee.frame.model.ticket.Phonelog;
+import com.gyee.frame.mapper.ticket.PhonelogMapper;
+import com.gyee.frame.service.ticket.PhonelogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2022-09-23
+ */
+@Service
+public class PhonelogServiceImpl extends ServiceImpl<PhonelogMapper, Phonelog> implements PhonelogService {
+
+    @Override
+    public void insertLog(Phonelog log) {
+        if (log != null)
+            log.setId(System.currentTimeMillis());
+
+        baseMapper.insert(log);
+    }
+}

src/main/java/com/gyee/frame/service/monitor/MonitorService.java

@@ -29,110 +29,27 @@ public class MonitorService extends SocketToolService {
     public static int initialstate=0;
 
 
-    public void monitor_target_matrixMonitor() throws Exception {
+    public List<MatrixVo> monitor_target_matrixMonitor(String station) throws Exception {
 
 
         Map<String, Map<String, WindTurbineTestingPointAi2>> wtpAimap = InitialRunner.wtpAimap;
-        String pageNumber = "pageNumber_4";
-        String functionNumber = "functionNumber_2";
-        StringBuilder sb = new StringBuilder();
-        sb.append(pageNumber).append("_").append(functionNumber);
 
-        String jobkey = String.valueOf(sb);
-        Map<String, CopyOnWriteArraySet<String>> keyidMap = WebSocketServer.keyidMap;
+        List<MatrixVo> vos = new ArrayList<>();
 
-        Map<String, CopyOnWriteArraySet<String>> tempmap=new HashMap<>();
+        if (InitialRunner.wp_wtmap.containsKey(station)) {
+            List<Windturbine> ls = InitialRunner.wp_wtmap.get(station);
 
-        if(initialstate==0)
-        {
-
-            List<Windpowerstation> wpls= InitialRunner.wpls;
-            List<Project> pjls=InitialRunner.pjls;
-
-            CopyOnWriteArraySet<String> set=new CopyOnWriteArraySet<String>();
-            for(Windpowerstation wp: wpls)
-            {
-                StringBuilder sb2 = new StringBuilder();
-                sb2.append("wp_").append(wp.getId());
-                set.add(String.valueOf(sb2));
-            }
-
-            for(Project pj: pjls)
-            {
-                StringBuilder sb2 = new StringBuilder();
-                sb2.append("pj_").append(pj.getId());
-                set.add(String.valueOf(sb2));
-            }
-            tempmap.put(jobkey,set);
-            keyidMap =tempmap;
-        }else {
-            keyidMap = WebSocketServer.keyidMap;
-        }
-
-//        CopyOnWriteArraySet<String> set=new CopyOnWriteArraySet<String>();
-//        set.add("wp_CL_FDC");
-//        set.add("wp_DX_FDC");
-//        set.add("wp_KB_FDC");
-//
-//        set.add("pj_CL01_GC");
-//        set.add("pj_CL02_GC");
-//        set.add("pj_DX01_GC");
-//        set.add("pj_KB01_GC");
-//        set.add("pj_KB02_GC");
-//        set.add("pj_KB03_GC");
-//        set.add("pj_KB04_GC");
-//
-//        keyidMap.put(jobkey,set);
-
-        if(keyidMap.containsKey(jobkey))
-        {
-            CopyOnWriteArraySet<String> set=keyidMap.get(jobkey);
-
-            for (String str : set) {
-
-                List<MatrixVo> vos = new ArrayList<>();
-
-                if (str.equals("all")) {
-                    continue;
-                }
-                String keyid_title = str.substring(0, 3);
-                String keyid = str.substring(3);
-
-                if (keyid_title.equals("wp_")) {
-
-                    if (InitialRunner.wp_wtmap.containsKey(keyid)) {
-                        List<Windturbine> ls = InitialRunner.wp_wtmap.get(keyid);
-
-
-                        if (null != ls && !ls.isEmpty()) {
-
-                            setMatrixValue(wtpAimap, vos, ls);
-
-                        }
-                    }
+            if (null != ls && !ls.isEmpty()) {
 
-                } else if (keyid_title.equals("pj_")) {
-
-                    if (InitialRunner.pj_wtmap.containsKey(keyid)) {
-                        List<Windturbine> ls = InitialRunner.pj_wtmap.get(keyid);
-                        if (null != ls && !ls.isEmpty()) {
-                            setMatrixValue(wtpAimap, vos, ls);
-                        }
-                    }
-
-                }
-
-
-                this.pushToWeb("pageNumber_4", "functionNumber_2", str, vos, Messagetype.MESSAGE);
+                setMatrixValue(wtpAimap, vos, ls);
 
             }
-            initialstate=1;
         }
 
-
+        return vos;
     }
 
-    private void setMatrixValue(Map<String, Map<String, WindTurbineTestingPointAi2>> wtpAimap, List<MatrixVo> vos, List<Windturbine> ls) throws Exception {
+    private List<MatrixVo> setMatrixValue(Map<String, Map<String, WindTurbineTestingPointAi2>> wtpAimap, List<MatrixVo> vos, List<Windturbine> ls) throws Exception {
         List<String> fjztls=new ArrayList<>();
         List<String> glls=new ArrayList<>();
         List<String> fsls=new ArrayList<>();
@@ -184,5 +101,7 @@ public class MonitorService extends SocketToolService {
                 vos.add(vo);
             }
         }
+
+        return vos;
     }
 }

src/main/java/com/gyee/frame/service/ticket/PhonelogService.java

@@ -0,0 +1,17 @@
+package com.gyee.frame.service.ticket;
+
+import com.gyee.frame.model.ticket.Phonelog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2022-09-23
+ */
+public interface PhonelogService extends IService<Phonelog> {
+
+    void insertLog(Phonelog log);
+}

src/main/resources/mybatis/ticket/PhonelogMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.frame.mapper.ticket.PhonelogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.gyee.frame.model.ticket.Phonelog">
+        <id column="ID" property="id" />
+        <result column="LABORNUM" property="labornum" />
+        <result column="MAC" property="mac" />
+        <result column="LOGTIME" property="logtime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, LABORNUM, MAC, LOGTIME
+    </sql>
+
+</mapper>