Merge remote-tracking branch 'origin/master'

pom.xml

@@ -329,11 +329,37 @@
 			<artifactId>pegdown</artifactId>
 			<version>1.4.2</version>
 		</dependency>
+<!-- webservice-->
+		<dependency>
+			<groupId>org.apache.ws.commons.axiom</groupId>
+			<artifactId>axiom-api</artifactId>
+			<version>1.2.12</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.axis2</groupId>
+			<artifactId>axis2</artifactId>
+			<version>1.6.1</version>
+			<type>pom</type>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.axis2</groupId>
+			<artifactId>axis2-kernel</artifactId>
+			<version>1.6.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.axis2</groupId>
+			<artifactId>axis2-adb</artifactId>
+			<version>1.6.1</version>
+		</dependency>
+		<!-- webservice-->
 	</dependencies>
 
 
 
 	<build>
+
+
 		<!-- 打包不带版本号 -->
 		<!-- <finalName>Gyee_Frame_NX</finalName> -->
 		<plugins>

src/main/java/com/gyee/frame/common/spring/InitialRunner.java

@@ -65,6 +65,8 @@ public class InitialRunner implements CommandLineRunner {
     public static List<Windturbine> wtallls = new ArrayList<Windturbine>(); // 风电机LIST集合（包含光电电）
 
     public static List<Windpowerstation> wpls = new ArrayList<Windpowerstation>(); // 风电场LIST集合
+    public static List<Windpowerstation> spls = new ArrayList<Windpowerstation>(); // 光伏场LIST集合
+    
     public static List<Project> pjls = new ArrayList<Project>(); // 项目LIST集合
     public static List<Line> linels = new ArrayList<Line>(); // 线路LIST集合
     public static List<Windturbine> wtls = new ArrayList<Windturbine>(); // 风电机LIST集合
@@ -192,6 +194,9 @@ public class InitialRunner implements CommandLineRunner {
                 if (wp.getId().endsWith("FDC")) {
                     wpls.add(wp);
                 }
+                if (wp.getId().endsWith("GDC")) {
+                	spls.add(wp);
+                }
                 wpmap.put(wp.getId(), wp);
             }
         }

src/main/java/com/gyee/frame/controller/health/HealthSubController.java

@@ -2,7 +2,6 @@ package com.gyee.frame.controller.health;
 
 import com.gyee.frame.common.conf.AjaxStatus;
 import com.gyee.frame.common.domain.AjaxResult;
-import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.custom.*;
 import com.gyee.frame.service.health.HealthSubService;
 import com.gyee.frame.service.weather.WeatherDay5Service;
@@ -176,17 +175,17 @@ public class HealthSubController {
     @ResponseBody
     @ApiOperation(value = "获取近5天气象数据", notes = "获取近5天气象数据")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")
     })
-    public AjaxResult getWeatherRealDay5Info(String wtId) throws Exception {
+    public AjaxResult getWeatherRealDay5Info(String wpId) throws Exception {
 
 
         Map<String, Object> map = new HashMap<String, Object>();
 
-        if(StringUtils.notEmp(wtId) && InitialRunner.wpmap.containsKey(wtId))
+        if(StringUtils.notEmp(wpId))
         {
 
-            map = weatherDay5Service.getWeatherRealDay5Info(wtId);
+            map = weatherDay5Service.getWeatherRealDay5Info(wpId);
         }
 
         if (null!=map) {

src/main/java/com/gyee/frame/controller/health/StopAnalysisController.java

@@ -0,0 +1,79 @@
+package com.gyee.frame.controller.health;
+
+import com.gyee.frame.common.conf.AjaxStatus;
+import com.gyee.frame.common.domain.AjaxResult;
+import com.gyee.frame.model.auto.StopAnalysismainVo;
+import com.gyee.frame.model.custom.StopAnalysisNodeVo;
+import com.gyee.frame.service.stopanalysis.StopAnalysisStaticService;
+import com.gyee.frame.util.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Controller
+@RequestMapping("/stopanalysis")
+@Api(value = "故障诊断" ,tags =  "故障诊断")
+public class StopAnalysisController {
+
+    @Resource
+    private StopAnalysisStaticService stopAnalysisService;
+
+
+    @PostMapping("/stopAnalysisList")
+    @ResponseBody
+    @ApiOperation(value = "故障诊断列表", notes = "故障诊断列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "modelId", value = "模型编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "typeId", value = "时间类型", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult stopAnalysisList( String wpId, String modelId, String typeId) throws Exception {
+
+        List<StopAnalysismainVo> vos = new ArrayList<StopAnalysismainVo>();
+        if (StringUtils.notEmp(wpId) && StringUtils.notEmp(modelId)&& StringUtils.notEmp(typeId))
+        {
+
+            vos=stopAnalysisService.stopAnalysisList(wpId, modelId, typeId);
+        }
+
+        if (null!=vos) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        }
+
+    }
+
+    @PostMapping("/stopAnalysisTree")
+    @ResponseBody
+    @ApiOperation(value = "故障诊断部件树", notes = "故障诊断部件树")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风场编号", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult stopAnalysisTree( String wtId) throws Exception {
+
+        List<StopAnalysisNodeVo> vos = new ArrayList<StopAnalysisNodeVo>();
+        if (StringUtils.notEmp(wtId))
+        {
+
+            vos=stopAnalysisService.findLocationTreeByWtId(wtId);
+        }
+
+        if (null!=vos) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        }
+
+    }
+
+}

src/main/java/com/gyee/frame/controller/monitor/MatrixPushController.java

@@ -1,9 +1,12 @@
 package com.gyee.frame.controller.monitor;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import com.gyee.frame.common.conf.AjaxStatus;
 import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.auto.Windpowerstation;
+import com.gyee.frame.model.auto.Windturbine;
 import com.gyee.frame.model.custom.MatrixVo;
 import com.gyee.frame.service.websocket.*;
 import io.swagger.annotations.Api;
@@ -187,4 +190,18 @@ public class MatrixPushController {
 
     }
 
+    @PostMapping("/findPVSimpleMatrixAll")
+    @ResponseBody
+    @ApiOperation(value = "全光伏场简单矩阵", notes = "全光伏场简单矩阵")
+	public AjaxResult findPVSimpleMatrixAll() throws Exception {
+		List<Object> vos = new ArrayList<>();
+		for (Windpowerstation wp : InitialRunner.spls) {
+			Map<String, Object> map = new HashMap<>();
+			List<List<MatrixVo>> inverterls = matrixPushByWpService.findSimpleMatrixList(wp.getId());
+			map.put("wpName", wp.getName());
+			map.put("inverterls", inverterls.get(0));
+			vos.add(map);
+		}
+		return AjaxResult.successData(AjaxStatus.success.code, vos);
+	}
 }

src/main/java/com/gyee/frame/controller/monitor/MonitorInverterPushController.java

@@ -0,0 +1,76 @@
+package com.gyee.frame.controller.monitor;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.google.common.collect.Maps;
+import com.gyee.frame.common.conf.AjaxStatus;
+import com.gyee.frame.common.domain.AjaxResult;
+import com.gyee.frame.common.spring.InitialRunner;
+import com.gyee.frame.model.auto.Windturbine;
+import com.gyee.frame.service.websocket.WtInfoPushService;
+import com.gyee.frame.service.websocket.WtWarnPushService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+@Controller
+@RequestMapping("/monitorinverter")
+@Api(value = "逆变器监视", tags = "逆变器监视")
+public class MonitorInverterPushController {
+
+	@Resource
+	private WtInfoPushService wtInfoPushService;
+	@Resource
+	private WtWarnPushService wtWarnPushService;
+
+	@PostMapping("/findInverterInfo")
+	@ResponseBody
+	@ApiOperation(value = "逆变器信息", notes = "逆变器AI点、报警点")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "wtId", value = "逆变器ID", required = true, dataType = "string", paramType = "query") })
+	public AjaxResult findWtInfo(String wtId) throws Exception {
+		List<Object> listAI = wtInfoPushService.findInverterInfo(wtId);
+		Object listDI = wtInfoPushService.findInverterDI(wtId);
+		Windturbine wt = InitialRunner.wtmap.get(wtId);
+		Map<String, Object> map = Maps.newHashMap();
+		map.put("listAI", listAI);
+		map.put("listDI", listDI);
+		map.put("info",wt);
+		return AjaxResult.successData(AjaxStatus.success.code, map);
+	}
+
+    @PostMapping("/findInverterInfoList")
+    @ResponseBody
+    @ApiOperation(value = "逆变器信息列表", notes = "逆变器信息列表")
+    @ApiImplicitParams({@ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")
+    })
+
+	public AjaxResult findWtInfoList(String wpId) throws Exception {
+		List<Map<String, Object>> vos = new ArrayList<>();
+		vos = wtInfoPushService.findInverterInfoList(wpId);
+		if (null != vos) {
+			return AjaxResult.successData(AjaxStatus.success.code, vos);
+		} else {
+			return AjaxResult.successData(AjaxStatus.error.code, vos);
+		}
+	}
+
+	@PostMapping("/findInverterPowerLine")
+	@ResponseBody
+	@ApiOperation(value = "逆变器开网频率", notes = "逆变器当日0点至今功率，间隔30分钟")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "wtId", value = "逆变器ID", required = true, dataType = "string", paramType = "query") })
+	public AjaxResult findInverterPowerLine(String wtId) throws Exception {
+		List<Object> list = wtInfoPushService.findInverterPowerCurve(wtId);
+		return AjaxResult.successData(AjaxStatus.success.code, list);
+	}
+}

src/main/java/com/gyee/frame/controller/recommen/RecommenController.java

@@ -3,11 +3,7 @@ package com.gyee.frame.controller.recommen;
 import com.gyee.frame.common.conf.AjaxStatus;
 import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.model.auto.Recommenmain;
-import com.gyee.frame.model.auto.Wobugeq;
-import com.gyee.frame.model.custom.ElementNode;
-import com.gyee.frame.model.custom.MainTrackVo;
-import com.gyee.frame.model.custom.Tablepar;
-import com.gyee.frame.model.custom.WoBugEqVo;
+import com.gyee.frame.model.custom.*;
 import com.gyee.frame.service.recommen.RecommenService;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.StringUtils;
@@ -465,7 +461,7 @@ public class RecommenController {
     })
     public AjaxResult findWobugeqByLocation(Tablepar tablepar, String location) throws Exception {
 
-        List<Wobugeq> vos=new ArrayList<>();
+        List<WoBugVo> vos=new ArrayList<>();
 
         if(StringUtils.notEmp(tablepar) && StringUtils.notEmp(location))
         {
@@ -476,9 +472,9 @@ public class RecommenController {
             c.set(Calendar.SECOND, 0);
             c.set(Calendar.MILLISECOND,0);
 
-            c.set(Calendar.DAY_OF_MONTH, c.getActualMinimum(Calendar.DAY_OF_MONTH));
+            c.set(Calendar.DAY_OF_YEAR, c.getActualMinimum(Calendar.DAY_OF_YEAR));
             Date beginDate = DateUtils.truncate(c.getTime());
-            c.set(Calendar.DAY_OF_MONTH, c.getActualMaximum(Calendar.DAY_OF_MONTH));
+            c.set(Calendar.DAY_OF_YEAR, c.getActualMaximum(Calendar.DAY_OF_YEAR));
             Date endDate = DateUtils.truncate(c.getTime());
             vos=recommenService.findWobugeqByLocation(tablepar,location, beginDate, endDate);
         }

src/main/java/com/gyee/frame/controller/scatter/ScatterController.java

@@ -183,7 +183,7 @@ public class ScatterController {
             if (years == Integer.valueOf(year) && months <= (Integer.valueOf(month) - 1)) {
                 StringBuilder sb = new StringBuilder();
                 if (StringUtils.notEmp(wtId)) {
-                    sb.append("scatter_").append(wtId).append("_").append(month);
+                    sb.append("scatter_").append(wtId).append("_").append(Integer.valueOf(month));
                 }
 
 

src/main/java/com/gyee/frame/mapper/auto/EliminatingeqMapper.java

@@ -0,0 +1,97 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.Eliminatingeq;
+import com.gyee.frame.model.auto.EliminatingeqExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface EliminatingeqMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ELIMINATINGEQ
+     *
+     * @mbg.generated
+     */
+    long countByExample(EliminatingeqExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ELIMINATINGEQ
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(EliminatingeqExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ELIMINATINGEQ
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Double id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ELIMINATINGEQ
+     *
+     * @mbg.generated
+     */
+    int insert(Eliminatingeq record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ELIMINATINGEQ
+     *
+     * @mbg.generated
+     */
+    int insertSelective(Eliminatingeq record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ELIMINATINGEQ
+     *
+     * @mbg.generated
+     */
+    List<Eliminatingeq> selectByExample(EliminatingeqExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ELIMINATINGEQ
+     *
+     * @mbg.generated
+     */
+    Eliminatingeq selectByPrimaryKey(Double id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ELIMINATINGEQ
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") Eliminatingeq record, @Param("example") EliminatingeqExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ELIMINATINGEQ
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") Eliminatingeq record, @Param("example") EliminatingeqExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ELIMINATINGEQ
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(Eliminatingeq record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ELIMINATINGEQ
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(Eliminatingeq record);
+}

src/main/java/com/gyee/frame/mapper/auto/StopAnalysisDetailMapper.java

@@ -0,0 +1,96 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.StopAnalysisDetail;
+import com.gyee.frame.model.auto.StopAnalysisDetailExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface StopAnalysisDetailMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAIL
+     *
+     * @mbg.generated
+     */
+    long countByExample(StopAnalysisDetailExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAIL
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(StopAnalysisDetailExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAIL
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAIL
+     *
+     * @mbg.generated
+     */
+    int insert(StopAnalysisDetail record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAIL
+     *
+     * @mbg.generated
+     */
+    int insertSelective(StopAnalysisDetail record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAIL
+     *
+     * @mbg.generated
+     */
+    List<StopAnalysisDetail> selectByExample(StopAnalysisDetailExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAIL
+     *
+     * @mbg.generated
+     */
+    StopAnalysisDetail selectByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAIL
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") StopAnalysisDetail record, @Param("example") StopAnalysisDetailExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAIL
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") StopAnalysisDetail record, @Param("example") StopAnalysisDetailExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAIL
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(StopAnalysisDetail record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAIL
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(StopAnalysisDetail record);
+}

src/main/java/com/gyee/frame/mapper/auto/StopAnalysisDetailVoMapper.java

@@ -0,0 +1,99 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.StopAnalysisDetailVo;
+import com.gyee.frame.model.auto.StopAnalysisDetailVoExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface StopAnalysisDetailVoMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAILVO
+     *
+     * @mbg.generated
+     */
+    long countByExample(StopAnalysisDetailVoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAILVO
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(StopAnalysisDetailVoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAILVO
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAILVO
+     *
+     * @mbg.generated
+     */
+    int insert(StopAnalysisDetailVo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAILVO
+     *
+     * @mbg.generated
+     */
+    int insertSelective(StopAnalysisDetailVo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAILVO
+     *
+     * @mbg.generated
+     */
+    List<StopAnalysisDetailVo> selectByExample(StopAnalysisDetailVoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAILVO
+     *
+     * @mbg.generated
+     */
+    StopAnalysisDetailVo selectByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAILVO
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") StopAnalysisDetailVo record, @Param("example") StopAnalysisDetailVoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAILVO
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") StopAnalysisDetailVo record, @Param("example") StopAnalysisDetailVoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAILVO
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(StopAnalysisDetailVo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAILVO
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(StopAnalysisDetailVo record);
+
+    int deleteAll();
+}

src/main/java/com/gyee/frame/mapper/auto/StopAnalysisMapper.java

@@ -0,0 +1,96 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.StopAnalysis;
+import com.gyee.frame.model.auto.StopAnalysisExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface StopAnalysisMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSIS
+     *
+     * @mbg.generated
+     */
+    long countByExample(StopAnalysisExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSIS
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(StopAnalysisExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSIS
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSIS
+     *
+     * @mbg.generated
+     */
+    int insert(StopAnalysis record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSIS
+     *
+     * @mbg.generated
+     */
+    int insertSelective(StopAnalysis record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSIS
+     *
+     * @mbg.generated
+     */
+    List<StopAnalysis> selectByExample(StopAnalysisExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSIS
+     *
+     * @mbg.generated
+     */
+    StopAnalysis selectByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSIS
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") StopAnalysis record, @Param("example") StopAnalysisExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSIS
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") StopAnalysis record, @Param("example") StopAnalysisExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSIS
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(StopAnalysis record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSIS
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(StopAnalysis record);
+}

src/main/java/com/gyee/frame/mapper/auto/StopAnalysismainMapper.java

@@ -0,0 +1,96 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.StopAnalysismain;
+import com.gyee.frame.model.auto.StopAnalysismainExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface StopAnalysismainMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAIN
+     *
+     * @mbg.generated
+     */
+    long countByExample(StopAnalysismainExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAIN
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(StopAnalysismainExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAIN
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAIN
+     *
+     * @mbg.generated
+     */
+    int insert(StopAnalysismain record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAIN
+     *
+     * @mbg.generated
+     */
+    int insertSelective(StopAnalysismain record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAIN
+     *
+     * @mbg.generated
+     */
+    List<StopAnalysismain> selectByExample(StopAnalysismainExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAIN
+     *
+     * @mbg.generated
+     */
+    StopAnalysismain selectByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAIN
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") StopAnalysismain record, @Param("example") StopAnalysismainExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAIN
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") StopAnalysismain record, @Param("example") StopAnalysismainExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAIN
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(StopAnalysismain record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAIN
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(StopAnalysismain record);
+}

src/main/java/com/gyee/frame/mapper/auto/StopAnalysismainVoMapper.java

@@ -0,0 +1,99 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.StopAnalysismainVo;
+import com.gyee.frame.model.auto.StopAnalysismainVoExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface StopAnalysismainVoMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAINVO
+     *
+     * @mbg.generated
+     */
+    long countByExample(StopAnalysismainVoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAINVO
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(StopAnalysismainVoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAINVO
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAINVO
+     *
+     * @mbg.generated
+     */
+    int insert(StopAnalysismainVo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAINVO
+     *
+     * @mbg.generated
+     */
+    int insertSelective(StopAnalysismainVo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAINVO
+     *
+     * @mbg.generated
+     */
+    List<StopAnalysismainVo> selectByExample(StopAnalysismainVoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAINVO
+     *
+     * @mbg.generated
+     */
+    StopAnalysismainVo selectByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAINVO
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") StopAnalysismainVo record, @Param("example") StopAnalysismainVoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAINVO
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") StopAnalysismainVo record, @Param("example") StopAnalysismainVoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAINVO
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(StopAnalysismainVo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAINVO
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(StopAnalysismainVo record);
+
+    int deleteAll();
+}

src/main/java/com/gyee/frame/model/auto/Eliminatingeq.java

@@ -0,0 +1,542 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Eliminatingeq implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ELIMINATINGEQ.ID
+     *
+     * @mbg.generated
+     */
+    private Double id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ELIMINATINGEQ.BADNAME
+     *
+     * @mbg.generated
+     */
+    private String badname;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ELIMINATINGEQ.MODELNUMBERS
+     *
+     * @mbg.generated
+     */
+    private String modelnumbers;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ELIMINATINGEQ.NUMBER
+     *
+     * @mbg.generated
+     */
+    private Long number;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ELIMINATINGEQ.BELONGS
+     *
+     * @mbg.generated
+     */
+    private String belongs;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ELIMINATINGEQ.DESCRIPTION
+     *
+     * @mbg.generated
+     */
+    private String description;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ELIMINATINGEQ.SITENUM
+     *
+     * @mbg.generated
+     */
+    private String sitenum;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ELIMINATINGEQ.CORPNUM
+     *
+     * @mbg.generated
+     */
+    private String corpnum;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ELIMINATINGEQ.BUGNUM
+     *
+     * @mbg.generated
+     */
+    private String bugnum;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ELIMINATINGEQ.RECORDPERSONNEL
+     *
+     * @mbg.generated
+     */
+    private String recordpersonnel;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ELIMINATINGEQ.MANUFACTURERS
+     *
+     * @mbg.generated
+     */
+    private String manufacturers;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ELIMINATINGEQ.EQNUM
+     *
+     * @mbg.generated
+     */
+    private String eqnum;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ELIMINATINGEQ.LOCATION
+     *
+     * @mbg.generated
+     */
+    private String location;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ELIMINATINGEQ.NEWEQNUM
+     *
+     * @mbg.generated
+     */
+    private String neweqnum;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ELIMINATINGEQ.REPLACETIME
+     *
+     * @mbg.generated
+     */
+    private Date replacetime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ELIMINATINGEQ.SPARENAME
+     *
+     * @mbg.generated
+     */
+    private String sparename;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table ELIMINATINGEQ
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ELIMINATINGEQ.ID
+     *
+     * @return the value of ELIMINATINGEQ.ID
+     *
+     * @mbg.generated
+     */
+    public Double getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ELIMINATINGEQ.ID
+     *
+     * @param id the value for ELIMINATINGEQ.ID
+     *
+     * @mbg.generated
+     */
+    public void setId(Double id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ELIMINATINGEQ.BADNAME
+     *
+     * @return the value of ELIMINATINGEQ.BADNAME
+     *
+     * @mbg.generated
+     */
+    public String getBadname() {
+        return badname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ELIMINATINGEQ.BADNAME
+     *
+     * @param badname the value for ELIMINATINGEQ.BADNAME
+     *
+     * @mbg.generated
+     */
+    public void setBadname(String badname) {
+        this.badname = badname == null ? null : badname.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ELIMINATINGEQ.MODELNUMBERS
+     *
+     * @return the value of ELIMINATINGEQ.MODELNUMBERS
+     *
+     * @mbg.generated
+     */
+    public String getModelnumbers() {
+        return modelnumbers;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ELIMINATINGEQ.MODELNUMBERS
+     *
+     * @param modelnumbers the value for ELIMINATINGEQ.MODELNUMBERS
+     *
+     * @mbg.generated
+     */
+    public void setModelnumbers(String modelnumbers) {
+        this.modelnumbers = modelnumbers == null ? null : modelnumbers.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ELIMINATINGEQ.NUMBER
+     *
+     * @return the value of ELIMINATINGEQ.NUMBER
+     *
+     * @mbg.generated
+     */
+    public Long getNumber() {
+        return number;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ELIMINATINGEQ.NUMBER
+     *
+     * @param number the value for ELIMINATINGEQ.NUMBER
+     *
+     * @mbg.generated
+     */
+    public void setNumber(Long number) {
+        this.number = number;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ELIMINATINGEQ.BELONGS
+     *
+     * @return the value of ELIMINATINGEQ.BELONGS
+     *
+     * @mbg.generated
+     */
+    public String getBelongs() {
+        return belongs;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ELIMINATINGEQ.BELONGS
+     *
+     * @param belongs the value for ELIMINATINGEQ.BELONGS
+     *
+     * @mbg.generated
+     */
+    public void setBelongs(String belongs) {
+        this.belongs = belongs == null ? null : belongs.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ELIMINATINGEQ.DESCRIPTION
+     *
+     * @return the value of ELIMINATINGEQ.DESCRIPTION
+     *
+     * @mbg.generated
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ELIMINATINGEQ.DESCRIPTION
+     *
+     * @param description the value for ELIMINATINGEQ.DESCRIPTION
+     *
+     * @mbg.generated
+     */
+    public void setDescription(String description) {
+        this.description = description == null ? null : description.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ELIMINATINGEQ.SITENUM
+     *
+     * @return the value of ELIMINATINGEQ.SITENUM
+     *
+     * @mbg.generated
+     */
+    public String getSitenum() {
+        return sitenum;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ELIMINATINGEQ.SITENUM
+     *
+     * @param sitenum the value for ELIMINATINGEQ.SITENUM
+     *
+     * @mbg.generated
+     */
+    public void setSitenum(String sitenum) {
+        this.sitenum = sitenum == null ? null : sitenum.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ELIMINATINGEQ.CORPNUM
+     *
+     * @return the value of ELIMINATINGEQ.CORPNUM
+     *
+     * @mbg.generated
+     */
+    public String getCorpnum() {
+        return corpnum;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ELIMINATINGEQ.CORPNUM
+     *
+     * @param corpnum the value for ELIMINATINGEQ.CORPNUM
+     *
+     * @mbg.generated
+     */
+    public void setCorpnum(String corpnum) {
+        this.corpnum = corpnum == null ? null : corpnum.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ELIMINATINGEQ.BUGNUM
+     *
+     * @return the value of ELIMINATINGEQ.BUGNUM
+     *
+     * @mbg.generated
+     */
+    public String getBugnum() {
+        return bugnum;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ELIMINATINGEQ.BUGNUM
+     *
+     * @param bugnum the value for ELIMINATINGEQ.BUGNUM
+     *
+     * @mbg.generated
+     */
+    public void setBugnum(String bugnum) {
+        this.bugnum = bugnum == null ? null : bugnum.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ELIMINATINGEQ.RECORDPERSONNEL
+     *
+     * @return the value of ELIMINATINGEQ.RECORDPERSONNEL
+     *
+     * @mbg.generated
+     */
+    public String getRecordpersonnel() {
+        return recordpersonnel;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ELIMINATINGEQ.RECORDPERSONNEL
+     *
+     * @param recordpersonnel the value for ELIMINATINGEQ.RECORDPERSONNEL
+     *
+     * @mbg.generated
+     */
+    public void setRecordpersonnel(String recordpersonnel) {
+        this.recordpersonnel = recordpersonnel == null ? null : recordpersonnel.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ELIMINATINGEQ.MANUFACTURERS
+     *
+     * @return the value of ELIMINATINGEQ.MANUFACTURERS
+     *
+     * @mbg.generated
+     */
+    public String getManufacturers() {
+        return manufacturers;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ELIMINATINGEQ.MANUFACTURERS
+     *
+     * @param manufacturers the value for ELIMINATINGEQ.MANUFACTURERS
+     *
+     * @mbg.generated
+     */
+    public void setManufacturers(String manufacturers) {
+        this.manufacturers = manufacturers == null ? null : manufacturers.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ELIMINATINGEQ.EQNUM
+     *
+     * @return the value of ELIMINATINGEQ.EQNUM
+     *
+     * @mbg.generated
+     */
+    public String getEqnum() {
+        return eqnum;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ELIMINATINGEQ.EQNUM
+     *
+     * @param eqnum the value for ELIMINATINGEQ.EQNUM
+     *
+     * @mbg.generated
+     */
+    public void setEqnum(String eqnum) {
+        this.eqnum = eqnum == null ? null : eqnum.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ELIMINATINGEQ.LOCATION
+     *
+     * @return the value of ELIMINATINGEQ.LOCATION
+     *
+     * @mbg.generated
+     */
+    public String getLocation() {
+        return location;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ELIMINATINGEQ.LOCATION
+     *
+     * @param location the value for ELIMINATINGEQ.LOCATION
+     *
+     * @mbg.generated
+     */
+    public void setLocation(String location) {
+        this.location = location == null ? null : location.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ELIMINATINGEQ.NEWEQNUM
+     *
+     * @return the value of ELIMINATINGEQ.NEWEQNUM
+     *
+     * @mbg.generated
+     */
+    public String getNeweqnum() {
+        return neweqnum;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ELIMINATINGEQ.NEWEQNUM
+     *
+     * @param neweqnum the value for ELIMINATINGEQ.NEWEQNUM
+     *
+     * @mbg.generated
+     */
+    public void setNeweqnum(String neweqnum) {
+        this.neweqnum = neweqnum == null ? null : neweqnum.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ELIMINATINGEQ.REPLACETIME
+     *
+     * @return the value of ELIMINATINGEQ.REPLACETIME
+     *
+     * @mbg.generated
+     */
+    public Date getReplacetime() {
+        return replacetime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ELIMINATINGEQ.REPLACETIME
+     *
+     * @param replacetime the value for ELIMINATINGEQ.REPLACETIME
+     *
+     * @mbg.generated
+     */
+    public void setReplacetime(Date replacetime) {
+        this.replacetime = replacetime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ELIMINATINGEQ.SPARENAME
+     *
+     * @return the value of ELIMINATINGEQ.SPARENAME
+     *
+     * @mbg.generated
+     */
+    public String getSparename() {
+        return sparename;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ELIMINATINGEQ.SPARENAME
+     *
+     * @param sparename the value for ELIMINATINGEQ.SPARENAME
+     *
+     * @mbg.generated
+     */
+    public void setSparename(String sparename) {
+        this.sparename = sparename == null ? null : sparename.trim();
+    }
+}

src/main/java/com/gyee/frame/model/auto/StopAnalysis.java

@@ -0,0 +1,179 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class StopAnalysis implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSIS.ID
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSIS.WPID
+     *
+     * @mbg.generated
+     */
+    private String wpid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSIS.RULEID
+     *
+     * @mbg.generated
+     */
+    private String ruleid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSIS.TIMETYPE
+     *
+     * @mbg.generated
+     */
+    private String timetype;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSIS.JUDEGDATE
+     *
+     * @mbg.generated
+     */
+    private Date judegdate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table STOPANALYSIS
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSIS.ID
+     *
+     * @return the value of STOPANALYSIS.ID
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSIS.ID
+     *
+     * @param id the value for STOPANALYSIS.ID
+     *
+     * @mbg.generated
+     */
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSIS.WPID
+     *
+     * @return the value of STOPANALYSIS.WPID
+     *
+     * @mbg.generated
+     */
+    public String getWpid() {
+        return wpid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSIS.WPID
+     *
+     * @param wpid the value for STOPANALYSIS.WPID
+     *
+     * @mbg.generated
+     */
+    public void setWpid(String wpid) {
+        this.wpid = wpid == null ? null : wpid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSIS.RULEID
+     *
+     * @return the value of STOPANALYSIS.RULEID
+     *
+     * @mbg.generated
+     */
+    public String getRuleid() {
+        return ruleid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSIS.RULEID
+     *
+     * @param ruleid the value for STOPANALYSIS.RULEID
+     *
+     * @mbg.generated
+     */
+    public void setRuleid(String ruleid) {
+        this.ruleid = ruleid == null ? null : ruleid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSIS.TIMETYPE
+     *
+     * @return the value of STOPANALYSIS.TIMETYPE
+     *
+     * @mbg.generated
+     */
+    public String getTimetype() {
+        return timetype;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSIS.TIMETYPE
+     *
+     * @param timetype the value for STOPANALYSIS.TIMETYPE
+     *
+     * @mbg.generated
+     */
+    public void setTimetype(String timetype) {
+        this.timetype = timetype == null ? null : timetype.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSIS.JUDEGDATE
+     *
+     * @return the value of STOPANALYSIS.JUDEGDATE
+     *
+     * @mbg.generated
+     */
+    public Date getJudegdate() {
+        return judegdate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSIS.JUDEGDATE
+     *
+     * @param judegdate the value for STOPANALYSIS.JUDEGDATE
+     *
+     * @mbg.generated
+     */
+    public void setJudegdate(Date judegdate) {
+        this.judegdate = judegdate;
+    }
+}

src/main/java/com/gyee/frame/model/auto/StopAnalysisDetail.java

@@ -0,0 +1,310 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+
+public class StopAnalysisDetail implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSISDETAIL.ID
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSISDETAIL.MAINID
+     *
+     * @mbg.generated
+     */
+    private String mainid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSISDETAIL.PID
+     *
+     * @mbg.generated
+     */
+    private String pid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSISDETAIL.NAME
+     *
+     * @mbg.generated
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSISDETAIL.JUDEGVULUE
+     *
+     * @mbg.generated
+     */
+    private String judegvulue;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSISDETAIL.URL
+     *
+     * @mbg.generated
+     */
+    private String url;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSISDETAIL.ISPARENT
+     *
+     * @mbg.generated
+     */
+    private Long isparent;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSISDETAIL.RID
+     *
+     * @mbg.generated
+     */
+    private String rid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSISDETAIL.WTID
+     *
+     * @mbg.generated
+     */
+    private String wtid;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table STOPANALYSISDETAIL
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSISDETAIL.ID
+     *
+     * @return the value of STOPANALYSISDETAIL.ID
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSISDETAIL.ID
+     *
+     * @param id the value for STOPANALYSISDETAIL.ID
+     *
+     * @mbg.generated
+     */
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSISDETAIL.MAINID
+     *
+     * @return the value of STOPANALYSISDETAIL.MAINID
+     *
+     * @mbg.generated
+     */
+    public String getMainid() {
+        return mainid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSISDETAIL.MAINID
+     *
+     * @param mainid the value for STOPANALYSISDETAIL.MAINID
+     *
+     * @mbg.generated
+     */
+    public void setMainid(String mainid) {
+        this.mainid = mainid == null ? null : mainid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSISDETAIL.PID
+     *
+     * @return the value of STOPANALYSISDETAIL.PID
+     *
+     * @mbg.generated
+     */
+    public String getPid() {
+        return pid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSISDETAIL.PID
+     *
+     * @param pid the value for STOPANALYSISDETAIL.PID
+     *
+     * @mbg.generated
+     */
+    public void setPid(String pid) {
+        this.pid = pid == null ? null : pid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSISDETAIL.NAME
+     *
+     * @return the value of STOPANALYSISDETAIL.NAME
+     *
+     * @mbg.generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSISDETAIL.NAME
+     *
+     * @param name the value for STOPANALYSISDETAIL.NAME
+     *
+     * @mbg.generated
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSISDETAIL.JUDEGVULUE
+     *
+     * @return the value of STOPANALYSISDETAIL.JUDEGVULUE
+     *
+     * @mbg.generated
+     */
+    public String getJudegvulue() {
+        return judegvulue;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSISDETAIL.JUDEGVULUE
+     *
+     * @param judegvulue the value for STOPANALYSISDETAIL.JUDEGVULUE
+     *
+     * @mbg.generated
+     */
+    public void setJudegvulue(String judegvulue) {
+        this.judegvulue = judegvulue == null ? null : judegvulue.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSISDETAIL.URL
+     *
+     * @return the value of STOPANALYSISDETAIL.URL
+     *
+     * @mbg.generated
+     */
+    public String getUrl() {
+        return url;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSISDETAIL.URL
+     *
+     * @param url the value for STOPANALYSISDETAIL.URL
+     *
+     * @mbg.generated
+     */
+    public void setUrl(String url) {
+        this.url = url == null ? null : url.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSISDETAIL.ISPARENT
+     *
+     * @return the value of STOPANALYSISDETAIL.ISPARENT
+     *
+     * @mbg.generated
+     */
+    public Long getIsparent() {
+        return isparent;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSISDETAIL.ISPARENT
+     *
+     * @param isparent the value for STOPANALYSISDETAIL.ISPARENT
+     *
+     * @mbg.generated
+     */
+    public void setIsparent(Long isparent) {
+        this.isparent = isparent;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSISDETAIL.RID
+     *
+     * @return the value of STOPANALYSISDETAIL.RID
+     *
+     * @mbg.generated
+     */
+    public String getRid() {
+        return rid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSISDETAIL.RID
+     *
+     * @param rid the value for STOPANALYSISDETAIL.RID
+     *
+     * @mbg.generated
+     */
+    public void setRid(String rid) {
+        this.rid = rid == null ? null : rid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSISDETAIL.WTID
+     *
+     * @return the value of STOPANALYSISDETAIL.WTID
+     *
+     * @mbg.generated
+     */
+    public String getWtid() {
+        return wtid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSISDETAIL.WTID
+     *
+     * @param wtid the value for STOPANALYSISDETAIL.WTID
+     *
+     * @mbg.generated
+     */
+    public void setWtid(String wtid) {
+        this.wtid = wtid == null ? null : wtid.trim();
+    }
+}

src/main/java/com/gyee/frame/model/auto/StopAnalysisDetailExample.java

@@ -0,0 +1,922 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class StopAnalysisDetailExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table STOPANALYSISDETAIL
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table STOPANALYSISDETAIL
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table STOPANALYSISDETAIL
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAIL
+     *
+     * @mbg.generated
+     */
+    public StopAnalysisDetailExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAIL
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAIL
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAIL
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAIL
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAIL
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAIL
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAIL
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAIL
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAIL
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAIL
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table STOPANALYSISDETAIL
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("ID like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("ID not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainidIsNull() {
+            addCriterion("MAINID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainidIsNotNull() {
+            addCriterion("MAINID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainidEqualTo(String value) {
+            addCriterion("MAINID =", value, "mainid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainidNotEqualTo(String value) {
+            addCriterion("MAINID <>", value, "mainid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainidGreaterThan(String value) {
+            addCriterion("MAINID >", value, "mainid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainidGreaterThanOrEqualTo(String value) {
+            addCriterion("MAINID >=", value, "mainid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainidLessThan(String value) {
+            addCriterion("MAINID <", value, "mainid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainidLessThanOrEqualTo(String value) {
+            addCriterion("MAINID <=", value, "mainid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainidLike(String value) {
+            addCriterion("MAINID like", value, "mainid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainidNotLike(String value) {
+            addCriterion("MAINID not like", value, "mainid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainidIn(List<String> values) {
+            addCriterion("MAINID in", values, "mainid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainidNotIn(List<String> values) {
+            addCriterion("MAINID not in", values, "mainid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainidBetween(String value1, String value2) {
+            addCriterion("MAINID between", value1, value2, "mainid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainidNotBetween(String value1, String value2) {
+            addCriterion("MAINID not between", value1, value2, "mainid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidIsNull() {
+            addCriterion("PID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidIsNotNull() {
+            addCriterion("PID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidEqualTo(String value) {
+            addCriterion("PID =", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotEqualTo(String value) {
+            addCriterion("PID <>", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidGreaterThan(String value) {
+            addCriterion("PID >", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidGreaterThanOrEqualTo(String value) {
+            addCriterion("PID >=", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidLessThan(String value) {
+            addCriterion("PID <", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidLessThanOrEqualTo(String value) {
+            addCriterion("PID <=", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidLike(String value) {
+            addCriterion("PID like", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotLike(String value) {
+            addCriterion("PID not like", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidIn(List<String> values) {
+            addCriterion("PID in", values, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotIn(List<String> values) {
+            addCriterion("PID not in", values, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidBetween(String value1, String value2) {
+            addCriterion("PID between", value1, value2, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotBetween(String value1, String value2) {
+            addCriterion("PID not between", value1, value2, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("NAME =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("NAME <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("NAME >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("NAME >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("NAME <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("NAME <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("NAME like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("NAME not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("NAME in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("NAME not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("NAME between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("NAME not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueIsNull() {
+            addCriterion("JUDEGVULUE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueIsNotNull() {
+            addCriterion("JUDEGVULUE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueEqualTo(String value) {
+            addCriterion("JUDEGVULUE =", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueNotEqualTo(String value) {
+            addCriterion("JUDEGVULUE <>", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueGreaterThan(String value) {
+            addCriterion("JUDEGVULUE >", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueGreaterThanOrEqualTo(String value) {
+            addCriterion("JUDEGVULUE >=", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueLessThan(String value) {
+            addCriterion("JUDEGVULUE <", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueLessThanOrEqualTo(String value) {
+            addCriterion("JUDEGVULUE <=", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueLike(String value) {
+            addCriterion("JUDEGVULUE like", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueNotLike(String value) {
+            addCriterion("JUDEGVULUE not like", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueIn(List<String> values) {
+            addCriterion("JUDEGVULUE in", values, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueNotIn(List<String> values) {
+            addCriterion("JUDEGVULUE not in", values, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueBetween(String value1, String value2) {
+            addCriterion("JUDEGVULUE between", value1, value2, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueNotBetween(String value1, String value2) {
+            addCriterion("JUDEGVULUE not between", value1, value2, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andUrlIsNull() {
+            addCriterion("URL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUrlIsNotNull() {
+            addCriterion("URL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUrlEqualTo(String value) {
+            addCriterion("URL =", value, "url");
+            return (Criteria) this;
+        }
+
+        public Criteria andUrlNotEqualTo(String value) {
+            addCriterion("URL <>", value, "url");
+            return (Criteria) this;
+        }
+
+        public Criteria andUrlGreaterThan(String value) {
+            addCriterion("URL >", value, "url");
+            return (Criteria) this;
+        }
+
+        public Criteria andUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("URL >=", value, "url");
+            return (Criteria) this;
+        }
+
+        public Criteria andUrlLessThan(String value) {
+            addCriterion("URL <", value, "url");
+            return (Criteria) this;
+        }
+
+        public Criteria andUrlLessThanOrEqualTo(String value) {
+            addCriterion("URL <=", value, "url");
+            return (Criteria) this;
+        }
+
+        public Criteria andUrlLike(String value) {
+            addCriterion("URL like", value, "url");
+            return (Criteria) this;
+        }
+
+        public Criteria andUrlNotLike(String value) {
+            addCriterion("URL not like", value, "url");
+            return (Criteria) this;
+        }
+
+        public Criteria andUrlIn(List<String> values) {
+            addCriterion("URL in", values, "url");
+            return (Criteria) this;
+        }
+
+        public Criteria andUrlNotIn(List<String> values) {
+            addCriterion("URL not in", values, "url");
+            return (Criteria) this;
+        }
+
+        public Criteria andUrlBetween(String value1, String value2) {
+            addCriterion("URL between", value1, value2, "url");
+            return (Criteria) this;
+        }
+
+        public Criteria andUrlNotBetween(String value1, String value2) {
+            addCriterion("URL not between", value1, value2, "url");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsparentIsNull() {
+            addCriterion("ISPARENT is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsparentIsNotNull() {
+            addCriterion("ISPARENT is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsparentEqualTo(Long value) {
+            addCriterion("ISPARENT =", value, "isparent");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsparentNotEqualTo(Long value) {
+            addCriterion("ISPARENT <>", value, "isparent");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsparentGreaterThan(Long value) {
+            addCriterion("ISPARENT >", value, "isparent");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsparentGreaterThanOrEqualTo(Long value) {
+            addCriterion("ISPARENT >=", value, "isparent");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsparentLessThan(Long value) {
+            addCriterion("ISPARENT <", value, "isparent");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsparentLessThanOrEqualTo(Long value) {
+            addCriterion("ISPARENT <=", value, "isparent");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsparentIn(List<Long> values) {
+            addCriterion("ISPARENT in", values, "isparent");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsparentNotIn(List<Long> values) {
+            addCriterion("ISPARENT not in", values, "isparent");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsparentBetween(Long value1, Long value2) {
+            addCriterion("ISPARENT between", value1, value2, "isparent");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsparentNotBetween(Long value1, Long value2) {
+            addCriterion("ISPARENT not between", value1, value2, "isparent");
+            return (Criteria) this;
+        }
+
+        public Criteria andRidIsNull() {
+            addCriterion("RID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRidIsNotNull() {
+            addCriterion("RID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRidEqualTo(String value) {
+            addCriterion("RID =", value, "rid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRidNotEqualTo(String value) {
+            addCriterion("RID <>", value, "rid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRidGreaterThan(String value) {
+            addCriterion("RID >", value, "rid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRidGreaterThanOrEqualTo(String value) {
+            addCriterion("RID >=", value, "rid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRidLessThan(String value) {
+            addCriterion("RID <", value, "rid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRidLessThanOrEqualTo(String value) {
+            addCriterion("RID <=", value, "rid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRidLike(String value) {
+            addCriterion("RID like", value, "rid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRidNotLike(String value) {
+            addCriterion("RID not like", value, "rid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRidIn(List<String> values) {
+            addCriterion("RID in", values, "rid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRidNotIn(List<String> values) {
+            addCriterion("RID not in", values, "rid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRidBetween(String value1, String value2) {
+            addCriterion("RID between", value1, value2, "rid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRidNotBetween(String value1, String value2) {
+            addCriterion("RID not between", value1, value2, "rid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidIsNull() {
+            addCriterion("WTID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidIsNotNull() {
+            addCriterion("WTID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidEqualTo(String value) {
+            addCriterion("WTID =", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotEqualTo(String value) {
+            addCriterion("WTID <>", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidGreaterThan(String value) {
+            addCriterion("WTID >", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidGreaterThanOrEqualTo(String value) {
+            addCriterion("WTID >=", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidLessThan(String value) {
+            addCriterion("WTID <", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidLessThanOrEqualTo(String value) {
+            addCriterion("WTID <=", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidLike(String value) {
+            addCriterion("WTID like", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotLike(String value) {
+            addCriterion("WTID not like", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidIn(List<String> values) {
+            addCriterion("WTID in", values, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotIn(List<String> values) {
+            addCriterion("WTID not in", values, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidBetween(String value1, String value2) {
+            addCriterion("WTID between", value1, value2, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotBetween(String value1, String value2) {
+            addCriterion("WTID not between", value1, value2, "wtid");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table STOPANALYSISDETAIL
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table STOPANALYSISDETAIL
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/gyee/frame/model/auto/StopAnalysisDetailVo.java

@@ -0,0 +1,244 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+
+public class StopAnalysisDetailVo implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSISDETAILVO.ID
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSISDETAILVO.PID
+     *
+     * @mbg.generated
+     */
+    private String pid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSISDETAILVO.NAME
+     *
+     * @mbg.generated
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSISDETAILVO.JUDEGVULUE
+     *
+     * @mbg.generated
+     */
+    private String judegvulue;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSISDETAILVO.URL
+     *
+     * @mbg.generated
+     */
+    private String url;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSISDETAILVO.ISPARENT
+     *
+     * @mbg.generated
+     */
+    private Long isparent;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSISDETAILVO.WTID
+     *
+     * @mbg.generated
+     */
+    private String wtid;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table STOPANALYSISDETAILVO
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSISDETAILVO.ID
+     *
+     * @return the value of STOPANALYSISDETAILVO.ID
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSISDETAILVO.ID
+     *
+     * @param id the value for STOPANALYSISDETAILVO.ID
+     *
+     * @mbg.generated
+     */
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSISDETAILVO.PID
+     *
+     * @return the value of STOPANALYSISDETAILVO.PID
+     *
+     * @mbg.generated
+     */
+    public String getPid() {
+        return pid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSISDETAILVO.PID
+     *
+     * @param pid the value for STOPANALYSISDETAILVO.PID
+     *
+     * @mbg.generated
+     */
+    public void setPid(String pid) {
+        this.pid = pid == null ? null : pid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSISDETAILVO.NAME
+     *
+     * @return the value of STOPANALYSISDETAILVO.NAME
+     *
+     * @mbg.generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSISDETAILVO.NAME
+     *
+     * @param name the value for STOPANALYSISDETAILVO.NAME
+     *
+     * @mbg.generated
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSISDETAILVO.JUDEGVULUE
+     *
+     * @return the value of STOPANALYSISDETAILVO.JUDEGVULUE
+     *
+     * @mbg.generated
+     */
+    public String getJudegvulue() {
+        return judegvulue;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSISDETAILVO.JUDEGVULUE
+     *
+     * @param judegvulue the value for STOPANALYSISDETAILVO.JUDEGVULUE
+     *
+     * @mbg.generated
+     */
+    public void setJudegvulue(String judegvulue) {
+        this.judegvulue = judegvulue == null ? null : judegvulue.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSISDETAILVO.URL
+     *
+     * @return the value of STOPANALYSISDETAILVO.URL
+     *
+     * @mbg.generated
+     */
+    public String getUrl() {
+        return url;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSISDETAILVO.URL
+     *
+     * @param url the value for STOPANALYSISDETAILVO.URL
+     *
+     * @mbg.generated
+     */
+    public void setUrl(String url) {
+        this.url = url == null ? null : url.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSISDETAILVO.ISPARENT
+     *
+     * @return the value of STOPANALYSISDETAILVO.ISPARENT
+     *
+     * @mbg.generated
+     */
+    public Long getIsparent() {
+        return isparent;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSISDETAILVO.ISPARENT
+     *
+     * @param isparent the value for STOPANALYSISDETAILVO.ISPARENT
+     *
+     * @mbg.generated
+     */
+    public void setIsparent(Long isparent) {
+        this.isparent = isparent;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSISDETAILVO.WTID
+     *
+     * @return the value of STOPANALYSISDETAILVO.WTID
+     *
+     * @mbg.generated
+     */
+    public String getWtid() {
+        return wtid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSISDETAILVO.WTID
+     *
+     * @param wtid the value for STOPANALYSISDETAILVO.WTID
+     *
+     * @mbg.generated
+     */
+    public void setWtid(String wtid) {
+        this.wtid = wtid == null ? null : wtid.trim();
+    }
+}

src/main/java/com/gyee/frame/model/auto/StopAnalysisDetailVoExample.java

@@ -0,0 +1,782 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class StopAnalysisDetailVoExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table STOPANALYSISDETAILVO
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table STOPANALYSISDETAILVO
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table STOPANALYSISDETAILVO
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAILVO
+     *
+     * @mbg.generated
+     */
+    public StopAnalysisDetailVoExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAILVO
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAILVO
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAILVO
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAILVO
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAILVO
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAILVO
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAILVO
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAILVO
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAILVO
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISDETAILVO
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table STOPANALYSISDETAILVO
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("ID like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("ID not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidIsNull() {
+            addCriterion("PID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidIsNotNull() {
+            addCriterion("PID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidEqualTo(String value) {
+            addCriterion("PID =", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotEqualTo(String value) {
+            addCriterion("PID <>", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidGreaterThan(String value) {
+            addCriterion("PID >", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidGreaterThanOrEqualTo(String value) {
+            addCriterion("PID >=", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidLessThan(String value) {
+            addCriterion("PID <", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidLessThanOrEqualTo(String value) {
+            addCriterion("PID <=", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidLike(String value) {
+            addCriterion("PID like", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotLike(String value) {
+            addCriterion("PID not like", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidIn(List<String> values) {
+            addCriterion("PID in", values, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotIn(List<String> values) {
+            addCriterion("PID not in", values, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidBetween(String value1, String value2) {
+            addCriterion("PID between", value1, value2, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotBetween(String value1, String value2) {
+            addCriterion("PID not between", value1, value2, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("NAME =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("NAME <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("NAME >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("NAME >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("NAME <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("NAME <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("NAME like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("NAME not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("NAME in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("NAME not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("NAME between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("NAME not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueIsNull() {
+            addCriterion("JUDEGVULUE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueIsNotNull() {
+            addCriterion("JUDEGVULUE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueEqualTo(String value) {
+            addCriterion("JUDEGVULUE =", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueNotEqualTo(String value) {
+            addCriterion("JUDEGVULUE <>", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueGreaterThan(String value) {
+            addCriterion("JUDEGVULUE >", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueGreaterThanOrEqualTo(String value) {
+            addCriterion("JUDEGVULUE >=", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueLessThan(String value) {
+            addCriterion("JUDEGVULUE <", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueLessThanOrEqualTo(String value) {
+            addCriterion("JUDEGVULUE <=", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueLike(String value) {
+            addCriterion("JUDEGVULUE like", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueNotLike(String value) {
+            addCriterion("JUDEGVULUE not like", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueIn(List<String> values) {
+            addCriterion("JUDEGVULUE in", values, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueNotIn(List<String> values) {
+            addCriterion("JUDEGVULUE not in", values, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueBetween(String value1, String value2) {
+            addCriterion("JUDEGVULUE between", value1, value2, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueNotBetween(String value1, String value2) {
+            addCriterion("JUDEGVULUE not between", value1, value2, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andUrlIsNull() {
+            addCriterion("URL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUrlIsNotNull() {
+            addCriterion("URL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUrlEqualTo(String value) {
+            addCriterion("URL =", value, "url");
+            return (Criteria) this;
+        }
+
+        public Criteria andUrlNotEqualTo(String value) {
+            addCriterion("URL <>", value, "url");
+            return (Criteria) this;
+        }
+
+        public Criteria andUrlGreaterThan(String value) {
+            addCriterion("URL >", value, "url");
+            return (Criteria) this;
+        }
+
+        public Criteria andUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("URL >=", value, "url");
+            return (Criteria) this;
+        }
+
+        public Criteria andUrlLessThan(String value) {
+            addCriterion("URL <", value, "url");
+            return (Criteria) this;
+        }
+
+        public Criteria andUrlLessThanOrEqualTo(String value) {
+            addCriterion("URL <=", value, "url");
+            return (Criteria) this;
+        }
+
+        public Criteria andUrlLike(String value) {
+            addCriterion("URL like", value, "url");
+            return (Criteria) this;
+        }
+
+        public Criteria andUrlNotLike(String value) {
+            addCriterion("URL not like", value, "url");
+            return (Criteria) this;
+        }
+
+        public Criteria andUrlIn(List<String> values) {
+            addCriterion("URL in", values, "url");
+            return (Criteria) this;
+        }
+
+        public Criteria andUrlNotIn(List<String> values) {
+            addCriterion("URL not in", values, "url");
+            return (Criteria) this;
+        }
+
+        public Criteria andUrlBetween(String value1, String value2) {
+            addCriterion("URL between", value1, value2, "url");
+            return (Criteria) this;
+        }
+
+        public Criteria andUrlNotBetween(String value1, String value2) {
+            addCriterion("URL not between", value1, value2, "url");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsparentIsNull() {
+            addCriterion("ISPARENT is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsparentIsNotNull() {
+            addCriterion("ISPARENT is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsparentEqualTo(Long value) {
+            addCriterion("ISPARENT =", value, "isparent");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsparentNotEqualTo(Long value) {
+            addCriterion("ISPARENT <>", value, "isparent");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsparentGreaterThan(Long value) {
+            addCriterion("ISPARENT >", value, "isparent");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsparentGreaterThanOrEqualTo(Long value) {
+            addCriterion("ISPARENT >=", value, "isparent");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsparentLessThan(Long value) {
+            addCriterion("ISPARENT <", value, "isparent");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsparentLessThanOrEqualTo(Long value) {
+            addCriterion("ISPARENT <=", value, "isparent");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsparentIn(List<Long> values) {
+            addCriterion("ISPARENT in", values, "isparent");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsparentNotIn(List<Long> values) {
+            addCriterion("ISPARENT not in", values, "isparent");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsparentBetween(Long value1, Long value2) {
+            addCriterion("ISPARENT between", value1, value2, "isparent");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsparentNotBetween(Long value1, Long value2) {
+            addCriterion("ISPARENT not between", value1, value2, "isparent");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidIsNull() {
+            addCriterion("WTID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidIsNotNull() {
+            addCriterion("WTID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidEqualTo(String value) {
+            addCriterion("WTID =", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotEqualTo(String value) {
+            addCriterion("WTID <>", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidGreaterThan(String value) {
+            addCriterion("WTID >", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidGreaterThanOrEqualTo(String value) {
+            addCriterion("WTID >=", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidLessThan(String value) {
+            addCriterion("WTID <", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidLessThanOrEqualTo(String value) {
+            addCriterion("WTID <=", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidLike(String value) {
+            addCriterion("WTID like", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotLike(String value) {
+            addCriterion("WTID not like", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidIn(List<String> values) {
+            addCriterion("WTID in", values, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotIn(List<String> values) {
+            addCriterion("WTID not in", values, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidBetween(String value1, String value2) {
+            addCriterion("WTID between", value1, value2, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotBetween(String value1, String value2) {
+            addCriterion("WTID not between", value1, value2, "wtid");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table STOPANALYSISDETAILVO
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table STOPANALYSISDETAILVO
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/gyee/frame/model/auto/StopAnalysisExample.java

@@ -0,0 +1,643 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class StopAnalysisExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table STOPANALYSIS
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table STOPANALYSIS
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table STOPANALYSIS
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSIS
+     *
+     * @mbg.generated
+     */
+    public StopAnalysisExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSIS
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSIS
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSIS
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSIS
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSIS
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSIS
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSIS
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSIS
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSIS
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSIS
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table STOPANALYSIS
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("ID like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("ID not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidIsNull() {
+            addCriterion("WPID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidIsNotNull() {
+            addCriterion("WPID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidEqualTo(String value) {
+            addCriterion("WPID =", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidNotEqualTo(String value) {
+            addCriterion("WPID <>", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidGreaterThan(String value) {
+            addCriterion("WPID >", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidGreaterThanOrEqualTo(String value) {
+            addCriterion("WPID >=", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidLessThan(String value) {
+            addCriterion("WPID <", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidLessThanOrEqualTo(String value) {
+            addCriterion("WPID <=", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidLike(String value) {
+            addCriterion("WPID like", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidNotLike(String value) {
+            addCriterion("WPID not like", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidIn(List<String> values) {
+            addCriterion("WPID in", values, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidNotIn(List<String> values) {
+            addCriterion("WPID not in", values, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidBetween(String value1, String value2) {
+            addCriterion("WPID between", value1, value2, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidNotBetween(String value1, String value2) {
+            addCriterion("WPID not between", value1, value2, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRuleidIsNull() {
+            addCriterion("RULEID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRuleidIsNotNull() {
+            addCriterion("RULEID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRuleidEqualTo(String value) {
+            addCriterion("RULEID =", value, "ruleid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRuleidNotEqualTo(String value) {
+            addCriterion("RULEID <>", value, "ruleid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRuleidGreaterThan(String value) {
+            addCriterion("RULEID >", value, "ruleid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRuleidGreaterThanOrEqualTo(String value) {
+            addCriterion("RULEID >=", value, "ruleid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRuleidLessThan(String value) {
+            addCriterion("RULEID <", value, "ruleid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRuleidLessThanOrEqualTo(String value) {
+            addCriterion("RULEID <=", value, "ruleid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRuleidLike(String value) {
+            addCriterion("RULEID like", value, "ruleid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRuleidNotLike(String value) {
+            addCriterion("RULEID not like", value, "ruleid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRuleidIn(List<String> values) {
+            addCriterion("RULEID in", values, "ruleid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRuleidNotIn(List<String> values) {
+            addCriterion("RULEID not in", values, "ruleid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRuleidBetween(String value1, String value2) {
+            addCriterion("RULEID between", value1, value2, "ruleid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRuleidNotBetween(String value1, String value2) {
+            addCriterion("RULEID not between", value1, value2, "ruleid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimetypeIsNull() {
+            addCriterion("TIMETYPE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimetypeIsNotNull() {
+            addCriterion("TIMETYPE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimetypeEqualTo(String value) {
+            addCriterion("TIMETYPE =", value, "timetype");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimetypeNotEqualTo(String value) {
+            addCriterion("TIMETYPE <>", value, "timetype");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimetypeGreaterThan(String value) {
+            addCriterion("TIMETYPE >", value, "timetype");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimetypeGreaterThanOrEqualTo(String value) {
+            addCriterion("TIMETYPE >=", value, "timetype");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimetypeLessThan(String value) {
+            addCriterion("TIMETYPE <", value, "timetype");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimetypeLessThanOrEqualTo(String value) {
+            addCriterion("TIMETYPE <=", value, "timetype");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimetypeLike(String value) {
+            addCriterion("TIMETYPE like", value, "timetype");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimetypeNotLike(String value) {
+            addCriterion("TIMETYPE not like", value, "timetype");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimetypeIn(List<String> values) {
+            addCriterion("TIMETYPE in", values, "timetype");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimetypeNotIn(List<String> values) {
+            addCriterion("TIMETYPE not in", values, "timetype");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimetypeBetween(String value1, String value2) {
+            addCriterion("TIMETYPE between", value1, value2, "timetype");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimetypeNotBetween(String value1, String value2) {
+            addCriterion("TIMETYPE not between", value1, value2, "timetype");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegdateIsNull() {
+            addCriterion("JUDEGDATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegdateIsNotNull() {
+            addCriterion("JUDEGDATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegdateEqualTo(Date value) {
+            addCriterion("JUDEGDATE =", value, "judegdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegdateNotEqualTo(Date value) {
+            addCriterion("JUDEGDATE <>", value, "judegdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegdateGreaterThan(Date value) {
+            addCriterion("JUDEGDATE >", value, "judegdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegdateGreaterThanOrEqualTo(Date value) {
+            addCriterion("JUDEGDATE >=", value, "judegdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegdateLessThan(Date value) {
+            addCriterion("JUDEGDATE <", value, "judegdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegdateLessThanOrEqualTo(Date value) {
+            addCriterion("JUDEGDATE <=", value, "judegdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegdateIn(List<Date> values) {
+            addCriterion("JUDEGDATE in", values, "judegdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegdateNotIn(List<Date> values) {
+            addCriterion("JUDEGDATE not in", values, "judegdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegdateBetween(Date value1, Date value2) {
+            addCriterion("JUDEGDATE between", value1, value2, "judegdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegdateNotBetween(Date value1, Date value2) {
+            addCriterion("JUDEGDATE not between", value1, value2, "judegdate");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table STOPANALYSIS
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table STOPANALYSIS
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/gyee/frame/model/auto/StopAnalysismain.java

@@ -0,0 +1,178 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+
+public class StopAnalysismain implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSISMAIN.ID
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSISMAIN.MAINID
+     *
+     * @mbg.generated
+     */
+    private String mainid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSISMAIN.WTID
+     *
+     * @mbg.generated
+     */
+    private String wtid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSISMAIN.MODELID
+     *
+     * @mbg.generated
+     */
+    private String modelid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSISMAIN.JUDEGVULUE
+     *
+     * @mbg.generated
+     */
+    private String judegvulue;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table STOPANALYSISMAIN
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSISMAIN.ID
+     *
+     * @return the value of STOPANALYSISMAIN.ID
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSISMAIN.ID
+     *
+     * @param id the value for STOPANALYSISMAIN.ID
+     *
+     * @mbg.generated
+     */
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSISMAIN.MAINID
+     *
+     * @return the value of STOPANALYSISMAIN.MAINID
+     *
+     * @mbg.generated
+     */
+    public String getMainid() {
+        return mainid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSISMAIN.MAINID
+     *
+     * @param mainid the value for STOPANALYSISMAIN.MAINID
+     *
+     * @mbg.generated
+     */
+    public void setMainid(String mainid) {
+        this.mainid = mainid == null ? null : mainid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSISMAIN.WTID
+     *
+     * @return the value of STOPANALYSISMAIN.WTID
+     *
+     * @mbg.generated
+     */
+    public String getWtid() {
+        return wtid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSISMAIN.WTID
+     *
+     * @param wtid the value for STOPANALYSISMAIN.WTID
+     *
+     * @mbg.generated
+     */
+    public void setWtid(String wtid) {
+        this.wtid = wtid == null ? null : wtid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSISMAIN.MODELID
+     *
+     * @return the value of STOPANALYSISMAIN.MODELID
+     *
+     * @mbg.generated
+     */
+    public String getModelid() {
+        return modelid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSISMAIN.MODELID
+     *
+     * @param modelid the value for STOPANALYSISMAIN.MODELID
+     *
+     * @mbg.generated
+     */
+    public void setModelid(String modelid) {
+        this.modelid = modelid == null ? null : modelid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSISMAIN.JUDEGVULUE
+     *
+     * @return the value of STOPANALYSISMAIN.JUDEGVULUE
+     *
+     * @mbg.generated
+     */
+    public String getJudegvulue() {
+        return judegvulue;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSISMAIN.JUDEGVULUE
+     *
+     * @param judegvulue the value for STOPANALYSISMAIN.JUDEGVULUE
+     *
+     * @mbg.generated
+     */
+    public void setJudegvulue(String judegvulue) {
+        this.judegvulue = judegvulue == null ? null : judegvulue.trim();
+    }
+}

src/main/java/com/gyee/frame/model/auto/StopAnalysismainExample.java

@@ -0,0 +1,652 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class StopAnalysismainExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table STOPANALYSISMAIN
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table STOPANALYSISMAIN
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table STOPANALYSISMAIN
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAIN
+     *
+     * @mbg.generated
+     */
+    public StopAnalysismainExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAIN
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAIN
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAIN
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAIN
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAIN
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAIN
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAIN
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAIN
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAIN
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAIN
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table STOPANALYSISMAIN
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("ID like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("ID not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainidIsNull() {
+            addCriterion("MAINID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainidIsNotNull() {
+            addCriterion("MAINID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainidEqualTo(String value) {
+            addCriterion("MAINID =", value, "mainid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainidNotEqualTo(String value) {
+            addCriterion("MAINID <>", value, "mainid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainidGreaterThan(String value) {
+            addCriterion("MAINID >", value, "mainid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainidGreaterThanOrEqualTo(String value) {
+            addCriterion("MAINID >=", value, "mainid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainidLessThan(String value) {
+            addCriterion("MAINID <", value, "mainid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainidLessThanOrEqualTo(String value) {
+            addCriterion("MAINID <=", value, "mainid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainidLike(String value) {
+            addCriterion("MAINID like", value, "mainid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainidNotLike(String value) {
+            addCriterion("MAINID not like", value, "mainid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainidIn(List<String> values) {
+            addCriterion("MAINID in", values, "mainid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainidNotIn(List<String> values) {
+            addCriterion("MAINID not in", values, "mainid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainidBetween(String value1, String value2) {
+            addCriterion("MAINID between", value1, value2, "mainid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMainidNotBetween(String value1, String value2) {
+            addCriterion("MAINID not between", value1, value2, "mainid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidIsNull() {
+            addCriterion("WTID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidIsNotNull() {
+            addCriterion("WTID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidEqualTo(String value) {
+            addCriterion("WTID =", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotEqualTo(String value) {
+            addCriterion("WTID <>", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidGreaterThan(String value) {
+            addCriterion("WTID >", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidGreaterThanOrEqualTo(String value) {
+            addCriterion("WTID >=", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidLessThan(String value) {
+            addCriterion("WTID <", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidLessThanOrEqualTo(String value) {
+            addCriterion("WTID <=", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidLike(String value) {
+            addCriterion("WTID like", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotLike(String value) {
+            addCriterion("WTID not like", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidIn(List<String> values) {
+            addCriterion("WTID in", values, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotIn(List<String> values) {
+            addCriterion("WTID not in", values, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidBetween(String value1, String value2) {
+            addCriterion("WTID between", value1, value2, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotBetween(String value1, String value2) {
+            addCriterion("WTID not between", value1, value2, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidIsNull() {
+            addCriterion("MODELID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidIsNotNull() {
+            addCriterion("MODELID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidEqualTo(String value) {
+            addCriterion("MODELID =", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidNotEqualTo(String value) {
+            addCriterion("MODELID <>", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidGreaterThan(String value) {
+            addCriterion("MODELID >", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidGreaterThanOrEqualTo(String value) {
+            addCriterion("MODELID >=", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidLessThan(String value) {
+            addCriterion("MODELID <", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidLessThanOrEqualTo(String value) {
+            addCriterion("MODELID <=", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidLike(String value) {
+            addCriterion("MODELID like", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidNotLike(String value) {
+            addCriterion("MODELID not like", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidIn(List<String> values) {
+            addCriterion("MODELID in", values, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidNotIn(List<String> values) {
+            addCriterion("MODELID not in", values, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidBetween(String value1, String value2) {
+            addCriterion("MODELID between", value1, value2, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidNotBetween(String value1, String value2) {
+            addCriterion("MODELID not between", value1, value2, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueIsNull() {
+            addCriterion("JUDEGVULUE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueIsNotNull() {
+            addCriterion("JUDEGVULUE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueEqualTo(String value) {
+            addCriterion("JUDEGVULUE =", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueNotEqualTo(String value) {
+            addCriterion("JUDEGVULUE <>", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueGreaterThan(String value) {
+            addCriterion("JUDEGVULUE >", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueGreaterThanOrEqualTo(String value) {
+            addCriterion("JUDEGVULUE >=", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueLessThan(String value) {
+            addCriterion("JUDEGVULUE <", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueLessThanOrEqualTo(String value) {
+            addCriterion("JUDEGVULUE <=", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueLike(String value) {
+            addCriterion("JUDEGVULUE like", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueNotLike(String value) {
+            addCriterion("JUDEGVULUE not like", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueIn(List<String> values) {
+            addCriterion("JUDEGVULUE in", values, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueNotIn(List<String> values) {
+            addCriterion("JUDEGVULUE not in", values, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueBetween(String value1, String value2) {
+            addCriterion("JUDEGVULUE between", value1, value2, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueNotBetween(String value1, String value2) {
+            addCriterion("JUDEGVULUE not between", value1, value2, "judegvulue");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table STOPANALYSISMAIN
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table STOPANALYSISMAIN
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/gyee/frame/model/auto/StopAnalysismainVo.java

@@ -0,0 +1,145 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+
+public class StopAnalysismainVo implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSISMAINVO.ID
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSISMAINVO.WTID
+     *
+     * @mbg.generated
+     */
+    private String wtid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSISMAINVO.MODELID
+     *
+     * @mbg.generated
+     */
+    private String modelid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column STOPANALYSISMAINVO.JUDEGVULUE
+     *
+     * @mbg.generated
+     */
+    private String judegvulue;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table STOPANALYSISMAINVO
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSISMAINVO.ID
+     *
+     * @return the value of STOPANALYSISMAINVO.ID
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSISMAINVO.ID
+     *
+     * @param id the value for STOPANALYSISMAINVO.ID
+     *
+     * @mbg.generated
+     */
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSISMAINVO.WTID
+     *
+     * @return the value of STOPANALYSISMAINVO.WTID
+     *
+     * @mbg.generated
+     */
+    public String getWtid() {
+        return wtid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSISMAINVO.WTID
+     *
+     * @param wtid the value for STOPANALYSISMAINVO.WTID
+     *
+     * @mbg.generated
+     */
+    public void setWtid(String wtid) {
+        this.wtid = wtid == null ? null : wtid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSISMAINVO.MODELID
+     *
+     * @return the value of STOPANALYSISMAINVO.MODELID
+     *
+     * @mbg.generated
+     */
+    public String getModelid() {
+        return modelid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSISMAINVO.MODELID
+     *
+     * @param modelid the value for STOPANALYSISMAINVO.MODELID
+     *
+     * @mbg.generated
+     */
+    public void setModelid(String modelid) {
+        this.modelid = modelid == null ? null : modelid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column STOPANALYSISMAINVO.JUDEGVULUE
+     *
+     * @return the value of STOPANALYSISMAINVO.JUDEGVULUE
+     *
+     * @mbg.generated
+     */
+    public String getJudegvulue() {
+        return judegvulue;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column STOPANALYSISMAINVO.JUDEGVULUE
+     *
+     * @param judegvulue the value for STOPANALYSISMAINVO.JUDEGVULUE
+     *
+     * @mbg.generated
+     */
+    public void setJudegvulue(String judegvulue) {
+        this.judegvulue = judegvulue == null ? null : judegvulue.trim();
+    }
+}

src/main/java/com/gyee/frame/model/auto/StopAnalysismainVoExample.java

@@ -0,0 +1,582 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class StopAnalysismainVoExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table STOPANALYSISMAINVO
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table STOPANALYSISMAINVO
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table STOPANALYSISMAINVO
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAINVO
+     *
+     * @mbg.generated
+     */
+    public StopAnalysismainVoExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAINVO
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAINVO
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAINVO
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAINVO
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAINVO
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAINVO
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAINVO
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAINVO
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAINVO
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table STOPANALYSISMAINVO
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table STOPANALYSISMAINVO
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("ID like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("ID not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidIsNull() {
+            addCriterion("WTID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidIsNotNull() {
+            addCriterion("WTID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidEqualTo(String value) {
+            addCriterion("WTID =", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotEqualTo(String value) {
+            addCriterion("WTID <>", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidGreaterThan(String value) {
+            addCriterion("WTID >", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidGreaterThanOrEqualTo(String value) {
+            addCriterion("WTID >=", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidLessThan(String value) {
+            addCriterion("WTID <", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidLessThanOrEqualTo(String value) {
+            addCriterion("WTID <=", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidLike(String value) {
+            addCriterion("WTID like", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotLike(String value) {
+            addCriterion("WTID not like", value, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidIn(List<String> values) {
+            addCriterion("WTID in", values, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotIn(List<String> values) {
+            addCriterion("WTID not in", values, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidBetween(String value1, String value2) {
+            addCriterion("WTID between", value1, value2, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWtidNotBetween(String value1, String value2) {
+            addCriterion("WTID not between", value1, value2, "wtid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidIsNull() {
+            addCriterion("MODELID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidIsNotNull() {
+            addCriterion("MODELID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidEqualTo(String value) {
+            addCriterion("MODELID =", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidNotEqualTo(String value) {
+            addCriterion("MODELID <>", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidGreaterThan(String value) {
+            addCriterion("MODELID >", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidGreaterThanOrEqualTo(String value) {
+            addCriterion("MODELID >=", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidLessThan(String value) {
+            addCriterion("MODELID <", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidLessThanOrEqualTo(String value) {
+            addCriterion("MODELID <=", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidLike(String value) {
+            addCriterion("MODELID like", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidNotLike(String value) {
+            addCriterion("MODELID not like", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidIn(List<String> values) {
+            addCriterion("MODELID in", values, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidNotIn(List<String> values) {
+            addCriterion("MODELID not in", values, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidBetween(String value1, String value2) {
+            addCriterion("MODELID between", value1, value2, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidNotBetween(String value1, String value2) {
+            addCriterion("MODELID not between", value1, value2, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueIsNull() {
+            addCriterion("JUDEGVULUE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueIsNotNull() {
+            addCriterion("JUDEGVULUE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueEqualTo(String value) {
+            addCriterion("JUDEGVULUE =", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueNotEqualTo(String value) {
+            addCriterion("JUDEGVULUE <>", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueGreaterThan(String value) {
+            addCriterion("JUDEGVULUE >", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueGreaterThanOrEqualTo(String value) {
+            addCriterion("JUDEGVULUE >=", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueLessThan(String value) {
+            addCriterion("JUDEGVULUE <", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueLessThanOrEqualTo(String value) {
+            addCriterion("JUDEGVULUE <=", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueLike(String value) {
+            addCriterion("JUDEGVULUE like", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueNotLike(String value) {
+            addCriterion("JUDEGVULUE not like", value, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueIn(List<String> values) {
+            addCriterion("JUDEGVULUE in", values, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueNotIn(List<String> values) {
+            addCriterion("JUDEGVULUE not in", values, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueBetween(String value1, String value2) {
+            addCriterion("JUDEGVULUE between", value1, value2, "judegvulue");
+            return (Criteria) this;
+        }
+
+        public Criteria andJudegvulueNotBetween(String value1, String value2) {
+            addCriterion("JUDEGVULUE not between", value1, value2, "judegvulue");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table STOPANALYSISMAINVO
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table STOPANALYSISMAINVO
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/gyee/frame/model/custom/StopAnalysisNodeVo.java

@@ -0,0 +1,77 @@
+package com.gyee.frame.model.custom;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class StopAnalysisNodeVo implements Serializable {
+	private static final long serialVersionUID = 1L;
+	private String id;
+	private String pid;
+	private String name;
+	private String judegVulue;
+	private String url;
+	private Boolean isParent;
+	private List<StopAnalysisNodeVo> children;
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public void setParent(Boolean parent) {
+		isParent = parent;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getPid() {
+		return pid;
+	}
+
+	public void setPid(String pid) {
+		this.pid = pid;
+	}
+
+
+	public Boolean getParent() {
+		return isParent;
+	}
+
+	public void setIsParent(Boolean parent) {
+		isParent = parent;
+	}
+
+	public List<StopAnalysisNodeVo> getChildren() {
+		return children;
+	}
+
+	public void setChildren(List<StopAnalysisNodeVo> children) {
+		this.children = children;
+	}
+
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getJudegVulue() {
+		return judegVulue;
+	}
+
+	public void setJudegVulue(String judegVulue) {
+		this.judegVulue = judegVulue;
+	}
+}

src/main/java/com/gyee/frame/model/custom/WoBugVo.java

@@ -0,0 +1,86 @@
+package com.gyee.frame.model.custom;
+
+import java.util.Date;
+
+public class WoBugVo {
+    private String xqbh;
+
+    private Date xqsj;
+
+    private String xqms;
+
+    private String xqry;
+
+    private String ghbj;
+
+    private String ghyy;
+
+    private Long ghsl;
+
+    private Integer status;
+
+    public String getXqbh() {
+        return xqbh;
+    }
+
+    public void setXqbh(String xqbh) {
+        this.xqbh = xqbh;
+    }
+
+    public Date getXqsj() {
+        return xqsj;
+    }
+
+    public void setXqsj(Date xqsj) {
+        this.xqsj = xqsj;
+    }
+
+    public String getXqms() {
+        return xqms;
+    }
+
+    public void setXqms(String xqms) {
+        this.xqms = xqms;
+    }
+
+    public String getXqry() {
+        return xqry;
+    }
+
+    public void setXqry(String xqry) {
+        this.xqry = xqry;
+    }
+
+    public String getGhbj() {
+        return ghbj;
+    }
+
+    public void setGhbj(String ghbj) {
+        this.ghbj = ghbj;
+    }
+
+    public String getGhyy() {
+        return ghyy;
+    }
+
+    public void setGhyy(String ghyy) {
+        this.ghyy = ghyy;
+    }
+
+
+    public Long getGhsl() {
+        return ghsl;
+    }
+
+    public void setGhsl(Long ghsl) {
+        this.ghsl = ghsl;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+}

src/main/java/com/gyee/frame/model/custom/analysistask/Analysisconclusion.java

@@ -0,0 +1,102 @@
+package com.gyee.frame.model.custom.analysistask;
+
+
+
+public class Analysisconclusion implements java.io.Serializable {
+
+	// Fields
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private String id;
+	private String windpowerstationid;
+	private String projectid;
+	private String windturbineid;
+	private String modelid;
+	private String score;
+	private String relatedid;
+	private String fullmarks;
+	private String rule;
+
+	// Constructors
+
+	/** default constructor */
+	public Analysisconclusion() {
+	}
+
+	public String getId() {
+    	return id;
+    }
+
+	public void setId(String id) {
+    	this.id = id;
+    }
+
+	public String getWindpowerstationid() {
+    	return windpowerstationid;
+    }
+
+	public void setWindpowerstationid(String windpowerstationid) {
+    	this.windpowerstationid = windpowerstationid;
+    }
+
+	public String getProjectid() {
+    	return projectid;
+    }
+
+	public void setProjectid(String projectid) {
+    	this.projectid = projectid;
+    }
+
+	public String getWindturbineid() {
+    	return windturbineid;
+    }
+
+	public void setWindturbineid(String windturbineid) {
+    	this.windturbineid = windturbineid;
+    }
+
+	public String getModelid() {
+    	return modelid;
+    }
+
+	public void setModelid(String modelid) {
+    	this.modelid = modelid;
+    }
+
+	public String getScore() {
+    	return score;
+    }
+
+	public void setScore(String score) {
+    	this.score = score;
+    }
+
+	public String getRelatedid() {
+    	return relatedid;
+    }
+
+	public void setRelatedid(String relatedid) {
+    	this.relatedid = relatedid;
+    }
+
+	public String getFullmarks() {
+    	return fullmarks;
+    }
+
+	public void setFullmarks(String fullmarks) {
+    	this.fullmarks = fullmarks;
+    }
+
+	public String getRule() {
+    	return rule;
+    }
+
+	public void setRule(String rule) {
+    	this.rule = rule;
+    }
+
+
+}

src/main/java/com/gyee/frame/model/custom/analysistask/Analysisconclusiontemp.java

@@ -0,0 +1,102 @@
+package com.gyee.frame.model.custom.analysistask;
+
+
+
+public class Analysisconclusiontemp implements java.io.Serializable {
+
+	// Fields
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private String id;
+	private String windpowerstationid;
+	private String projectid;
+	private String windturbineid;
+	private String modelid;
+	private String score;
+	private String relatedid;
+	private String fullmarks;
+	private String rule;
+
+	// Constructors
+
+	/** default constructor */
+	public Analysisconclusiontemp() {
+	}
+
+	public String getId() {
+    	return id;
+    }
+
+	public void setId(String id) {
+    	this.id = id;
+    }
+
+	public String getWindpowerstationid() {
+    	return windpowerstationid;
+    }
+
+	public void setWindpowerstationid(String windpowerstationid) {
+    	this.windpowerstationid = windpowerstationid;
+    }
+
+	public String getProjectid() {
+    	return projectid;
+    }
+
+	public void setProjectid(String projectid) {
+    	this.projectid = projectid;
+    }
+
+	public String getWindturbineid() {
+    	return windturbineid;
+    }
+
+	public void setWindturbineid(String windturbineid) {
+    	this.windturbineid = windturbineid;
+    }
+
+	public String getModelid() {
+    	return modelid;
+    }
+
+	public void setModelid(String modelid) {
+    	this.modelid = modelid;
+    }
+
+	public String getScore() {
+    	return score;
+    }
+
+	public void setScore(String score) {
+    	this.score = score;
+    }
+
+	public String getRelatedid() {
+    	return relatedid;
+    }
+
+	public void setRelatedid(String relatedid) {
+    	this.relatedid = relatedid;
+    }
+
+	public String getFullmarks() {
+    	return fullmarks;
+    }
+
+	public void setFullmarks(String fullmarks) {
+    	this.fullmarks = fullmarks;
+    }
+
+	public String getRule() {
+    	return rule;
+    }
+
+	public void setRule(String rule) {
+    	this.rule = rule;
+    }
+
+
+}

src/main/java/com/gyee/frame/model/custom/analysistask/Analysistask.java

@@ -0,0 +1,94 @@
+package com.gyee.frame.model.custom.analysistask;
+
+import java.util.Date;
+
+
+public class Analysistask implements java.io.Serializable {
+
+	// Fields
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private String id;
+	private String windpowerstationid;
+	private String projectid;
+	private String windturbineid;
+	private String ruleid;
+	private Integer timetype;
+	private Date tasktime;
+	private String analysistype;
+
+	// Constructors
+
+	/** default constructor */
+	public Analysistask() {
+	}
+
+	public String getId() {
+    	return id;
+    }
+
+	public void setId(String id) {
+    	this.id = id;
+    }
+
+	public String getWindpowerstationid() {
+    	return windpowerstationid;
+    }
+
+	public void setWindpowerstationid(String windpowerstationid) {
+    	this.windpowerstationid = windpowerstationid;
+    }
+
+	public String getProjectid() {
+    	return projectid;
+    }
+
+	public void setProjectid(String projectid) {
+    	this.projectid = projectid;
+    }
+
+	public String getWindturbineid() {
+    	return windturbineid;
+    }
+
+	public void setWindturbineid(String windturbineid) {
+    	this.windturbineid = windturbineid;
+    }
+
+	public String getRuleid() {
+    	return ruleid;
+    }
+
+	public void setRuleid(String ruleid) {
+    	this.ruleid = ruleid;
+    }
+
+	public Integer getTimetype() {
+    	return timetype;
+    }
+
+	public void setTimetype(Integer timetype) {
+    	this.timetype = timetype;
+    }
+
+	public Date getTasktime() {
+    	return tasktime;
+    }
+
+	public void setTasktime(Date tasktime) {
+    	this.tasktime = tasktime;
+    }
+
+	public String getAnalysistype() {
+    	return analysistype;
+    }
+
+	public void setAnalysistype(String analysistype) {
+    	this.analysistype = analysistype;
+    }
+
+	
+}

src/main/java/com/gyee/frame/model/custom/analysistask/Analysistaskdetail.java

@@ -0,0 +1,140 @@
+package com.gyee.frame.model.custom.analysistask;
+
+
+
+public class Analysistaskdetail implements java.io.Serializable {
+
+	// Fields
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private String id;
+	private String relatedid;
+	private String windturbineid;
+	private String unitid;
+	private String unitnmae;
+	private String levels;
+	private String parent;
+	private Boolean isleaf;
+	private Boolean expanded;
+	private Boolean loaded;
+	private String name;
+	private String confidence;
+	private String factvalue;
+
+	// Constructors
+
+	public String getLevels() {
+		return levels;
+	}
+
+	public void setLevels(String levels) {
+		this.levels = levels;
+	}
+
+	public Boolean getLoaded() {
+		return loaded;
+	}
+
+	public void setLoaded(Boolean loaded) {
+		this.loaded = loaded;
+	}
+
+	public void setIsleaf(Boolean isleaf) {
+		this.isleaf = isleaf;
+	}
+
+	public void setExpanded(Boolean expanded) {
+		this.expanded = expanded;
+	}
+
+	/** default constructor */
+	public Analysistaskdetail() {
+	}
+
+	public String getId() {
+    	return id;
+    }
+
+	public void setId(String id) {
+    	this.id = id;
+    }
+
+	public String getRelatedid() {
+    	return relatedid;
+    }
+
+	public void setRelatedid(String relatedid) {
+    	this.relatedid = relatedid;
+    }
+
+	public String getWindturbineid() {
+    	return windturbineid;
+    }
+
+	public void setWindturbineid(String windturbineid) {
+    	this.windturbineid = windturbineid;
+    }
+
+	public String getUnitid() {
+    	return unitid;
+    }
+
+	public void setUnitid(String unitid) {
+    	this.unitid = unitid;
+    }
+
+	public String getUnitnmae() {
+    	return unitnmae;
+    }
+
+	public void setUnitnmae(String unitnmae) {
+    	this.unitnmae = unitnmae;
+    }
+
+	public String getParent() {
+    	return parent;
+    }
+
+	public void setParent(String parent) {
+    	this.parent = parent;
+    }
+
+
+	public Boolean getIsleaf() {
+		return isleaf;
+	}
+
+	public Boolean getExpanded() {
+		return expanded;
+	}
+
+	public String getName() {
+    	return name;
+    }
+
+	public void setName(String name) {
+    	this.name = name;
+    }
+
+	public String getConfidence() {
+    	return confidence;
+    }
+
+	public void setConfidence(String confidence) {
+    	this.confidence = confidence;
+    }
+
+	public String getFactvalue() {
+    	return factvalue;
+    }
+
+	public void setFactvalue(String factvalue) {
+    	this.factvalue = factvalue;
+    }
+
+
+
+}

src/main/java/com/gyee/frame/model/custom/analysistask/Analysistaskdetailtemp.java

@@ -0,0 +1,144 @@
+package com.gyee.frame.model.custom.analysistask;
+
+
+
+
+public class Analysistaskdetailtemp implements java.io.Serializable {
+
+	// Fields
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private String id;
+	private String relatedid;
+	private String windturbineid;
+	private String unitid;
+	private String unitnmae;
+	private String levels;
+	private String parent;
+	private Boolean isleaf;
+	private Boolean expanded;
+	private Boolean loaded;
+	private String name;
+	private String confidence;
+	private String factvalue;
+	
+	public Boolean getLoaded() {
+		return loaded;
+	}
+
+	public void setLoaded(Boolean loaded) {
+		this.loaded = loaded;
+	}
+
+	public String getLevels() {
+		return levels;
+	}
+
+	public void setLevels(String levels) {
+		this.levels = levels;
+	}
+
+	
+	// Constructors
+
+	/** default constructor */
+	public Analysistaskdetailtemp() {
+	}
+
+	public String getId() {
+    	return id;
+    }
+
+	public void setId(String id) {
+    	this.id = id;
+    }
+
+	public String getRelatedid() {
+    	return relatedid;
+    }
+
+	public void setRelatedid(String relatedid) {
+    	this.relatedid = relatedid;
+    }
+
+	public String getWindturbineid() {
+    	return windturbineid;
+    }
+
+	public void setWindturbineid(String windturbineid) {
+    	this.windturbineid = windturbineid;
+    }
+
+	public String getUnitid() {
+    	return unitid;
+    }
+
+	public void setUnitid(String unitid) {
+    	this.unitid = unitid;
+    }
+
+	public String getUnitnmae() {
+    	return unitnmae;
+    }
+
+	public void setUnitnmae(String unitnmae) {
+    	this.unitnmae = unitnmae;
+    }
+
+	public String getParent() {
+    	return parent;
+    }
+
+	public void setParent(String parent) {
+    	this.parent = parent;
+    }
+
+
+	public Boolean getIsleaf() {
+		return isleaf;
+	}
+
+	public void setIsleaf(Boolean isleaf) {
+		this.isleaf = isleaf;
+	}
+
+
+
+	public Boolean getExpanded() {
+		return expanded;
+	}
+
+	public void setExpanded(Boolean expanded) {
+		this.expanded = expanded;
+	}
+
+	public String getName() {
+    	return name;
+    }
+
+	public void setName(String name) {
+    	this.name = name;
+    }
+
+	public String getConfidence() {
+    	return confidence;
+    }
+
+	public void setConfidence(String confidence) {
+    	this.confidence = confidence;
+    }
+
+	public String getFactvalue() {
+    	return factvalue;
+    }
+
+	public void setFactvalue(String factvalue) {
+    	this.factvalue = factvalue;
+    }
+
+
+
+}

src/main/java/com/gyee/frame/model/custom/analysistask/Analysistasktemp.java

@@ -0,0 +1,112 @@
+package com.gyee.frame.model.custom.analysistask;
+
+import java.util.Date;
+
+
+public class Analysistasktemp implements java.io.Serializable {
+
+	// Fields
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private String id;
+	private String windpowerstationid;
+	private String projectid;
+	private String windturbineid;
+	private String ruleid;
+	private Integer timetype;
+	private Date begintime;
+	private Date endtime;
+	private Date tasktime;
+	private String analysistype;
+
+	// Constructors
+
+	/** default constructor */
+	public Analysistasktemp() {
+	}
+
+	public Date getBegintime() {
+		return begintime;
+	}
+
+	public void setBegintime(Date begintime) {
+		this.begintime = begintime;
+	}
+
+	public Date getEndtime() {
+		return endtime;
+	}
+
+	public void setEndtime(Date endtime) {
+		this.endtime = endtime;
+	}
+
+	public String getId() {
+    	return id;
+    }
+
+	public void setId(String id) {
+    	this.id = id;
+    }
+
+	public String getWindpowerstationid() {
+    	return windpowerstationid;
+    }
+
+	public void setWindpowerstationid(String windpowerstationid) {
+    	this.windpowerstationid = windpowerstationid;
+    }
+
+	public String getProjectid() {
+    	return projectid;
+    }
+
+	public void setProjectid(String projectid) {
+    	this.projectid = projectid;
+    }
+
+	public String getWindturbineid() {
+    	return windturbineid;
+    }
+
+	public void setWindturbineid(String windturbineid) {
+    	this.windturbineid = windturbineid;
+    }
+
+	public String getRuleid() {
+    	return ruleid;
+    }
+
+	public void setRuleid(String ruleid) {
+    	this.ruleid = ruleid;
+    }
+
+	public Integer getTimetype() {
+    	return timetype;
+    }
+
+	public void setTimetype(Integer timetype) {
+    	this.timetype = timetype;
+    }
+
+	public Date getTasktime() {
+    	return tasktime;
+    }
+
+	public void setTasktime(Date tasktime) {
+    	this.tasktime = tasktime;
+    }
+
+	public String getAnalysistype() {
+    	return analysistype;
+    }
+
+	public void setAnalysistype(String analysistype) {
+    	this.analysistype = analysistype;
+    }
+
+	
+}

src/main/java/com/gyee/frame/model/custom/analysistask/ArrayOfComputeResult.java

@@ -0,0 +1,18 @@
+package com.gyee.frame.model.custom.analysistask;
+
+import java.util.List;
+
+public class ArrayOfComputeResult implements java.io.Serializable {
+
+    private static final long serialVersionUID = 1L;
+		List<ComputeResult> computeResults;
+		public List<ComputeResult> getComputeResults() {
+			return computeResults;
+		}
+		public void setComputeResults(List<ComputeResult> computeResults) {
+			this.computeResults = computeResults;
+		}
+		
+		
+
+}

src/main/java/com/gyee/frame/model/custom/analysistask/ComputeResult.java

@@ -0,0 +1,81 @@
+package com.gyee.frame.model.custom.analysistask;
+
+import java.io.Serializable;
+
+
+public class ComputeResult implements Serializable {
+
+
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 3733264234609723182L;
+	//风机型号
+	private String ModelId;
+	//部件编号
+	private String UnitId;
+	//规则汇总编号
+	private String RoleIndexId;
+	//规则编号
+	private String RoleId;
+	//规则编号
+	private String FactValue;
+	
+	public ComputeResult()
+	{
+		
+	}
+
+	public ComputeResult(String modelId, String unitId, String roleIndexId, String roleId, String factValue) {
+		super();
+		ModelId = modelId;
+		UnitId = unitId;
+		RoleIndexId = roleIndexId;
+		RoleId = roleId;
+		FactValue = factValue;
+	}
+
+	public String getModelId() {
+		return ModelId;
+	}
+
+	public void setModelId(String modelId) {
+		ModelId = modelId;
+	}
+
+	public String getUnitId() {
+		return UnitId;
+	}
+
+	public void setUnitId(String unitId) {
+		UnitId = unitId;
+	}
+
+	public String getRoleIndexId() {
+		return RoleIndexId;
+	}
+
+	public void setRoleIndexId(String roleIndexId) {
+		RoleIndexId = roleIndexId;
+	}
+
+	public String getRoleId() {
+		return RoleId;
+	}
+
+	public void setRoleId(String roleId) {
+		RoleId = roleId;
+	}
+
+	public String getFactValue() {
+		return FactValue;
+	}
+
+	public void setFactValue(String factValue) {
+		FactValue = factValue;
+	}
+	
+	
+	
+}

src/main/java/com/gyee/frame/model/custom/analysistask/Parmas.java

@@ -0,0 +1,52 @@
+package com.gyee.frame.model.custom.analysistask;
+
+import java.util.Date;
+
+public class Parmas implements java.io.Serializable {
+
+    private static final long serialVersionUID = 1L;
+    
+    private String windturbineId;
+
+	private String modelId;
+
+	private Date  startTime;
+
+	private Date endTime;
+
+	public String getWindturbineId() {
+		return windturbineId;
+	}
+
+	public void setWindturbineId(String windturbineId) {
+		this.windturbineId = windturbineId;
+	}
+
+	public String getModelId() {
+		return modelId;
+	}
+
+	public void setModelId(String modelId) {
+		this.modelId = modelId;
+	}
+
+	public Date getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
+
+	public Date getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(Date endTime) {
+		this.endTime = endTime;
+	}
+	
+	
+
+
+}

src/main/java/com/gyee/frame/service/EliminatingeqService.java

@@ -0,0 +1,125 @@
+package com.gyee.frame.service;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.dataSources.DataSource;
+import com.gyee.frame.common.dataSources.DataSourceType;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.EliminatingeqMapper;
+import com.gyee.frame.model.auto.Eliminatingeq;
+import com.gyee.frame.model.auto.EliminatingeqExample;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 线路 EliminatingeqService
+ * @Title: EliminatingeqService.java 
+ * @Package com.gyee.frame.service 
+ * @author gyee_自动生成
+ * @email 1@qq.com
+ * @date 2019-12-31 14:58:09  
+ **/
+@Service
+public class EliminatingeqService implements BaseService<Eliminatingeq, EliminatingeqExample> {
+	@Resource
+	private EliminatingeqMapper eliminatingeqMapper;
+	
+
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<Double> lista=Convert.toDoubleArrayList(ids);
+			EliminatingeqExample example=new EliminatingeqExample();
+			example.createCriteria().andIdIn(lista);
+			return eliminatingeqMapper.deleteByExample(example);
+
+
+	}
+	
+	
+	@Override
+	public Eliminatingeq selectByPrimaryKey(String id) {
+				
+			return eliminatingeqMapper.selectByPrimaryKey(Double.valueOf(id));
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(Eliminatingeq record) {
+		return eliminatingeqMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(Eliminatingeq record) {
+				
+
+				
+		return eliminatingeqMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(Eliminatingeq record, EliminatingeqExample example) {
+		
+		return eliminatingeqMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(Eliminatingeq record, EliminatingeqExample example) {
+		
+		return eliminatingeqMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<Eliminatingeq> selectByExample(EliminatingeqExample example) {
+		
+		return eliminatingeqMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(EliminatingeqExample example) {
+		
+		return eliminatingeqMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(EliminatingeqExample example) {
+		
+		return eliminatingeqMapper.deleteByExample(example);
+	}
+	@DataSource(value = DataSourceType.TICKET)
+	public List<Eliminatingeq> findEliminatingeqById(String bugnum) {
+
+		List<Eliminatingeq> list=new ArrayList<>();
+
+		if(StringUtils.notEmp(bugnum) )
+		{
+			EliminatingeqExample example=new EliminatingeqExample();
+			example.setOrderByClause("bugnum asc");
+
+			EliminatingeqExample.Criteria criteria =example.createCriteria();
+
+			criteria.andBugnumEqualTo(bugnum);
+
+			list= eliminatingeqMapper.selectByExample(example);
+		}
+
+		return list;
+
+	}
+
+
+
+}

src/main/java/com/gyee/frame/service/PowerToPowerService.java

@@ -0,0 +1,132 @@
+package com.gyee.frame.service;
+
+import com.gyee.frame.common.spring.InitialRunner;
+import com.gyee.frame.model.auto.Windturbine;
+import com.gyee.frame.model.auto.Windturbinepowercurvefitting;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
+
+
+@Service
+public class PowerToPowerService {
+
+	private final String QS = "0";
+	private final String FD = "-1";
+	private final String GF = "-2";
+
+	public double getPowerByWp(double speed, String wpId, double step) {
+		double power = 0.0;
+		List<Windturbine> wtls=new ArrayList<>();
+		if(wpId.equals(QS))
+		{
+
+		}else if(wpId.equals(FD)) {
+			for(Windturbine wt:InitialRunner.wtallls)
+			{
+				if (wt.getWindpowerstationid().endsWith("FDC"))
+				{
+					wtls.add(wt);
+				}
+			}
+		}
+		else if (InitialRunner.wp_wtmap.containsKey(wpId)) {
+			wtls = InitialRunner.wp_wtmap.get(wpId);
+		}
+
+			for (Windturbine wt : wtls) {
+				Map<Double, Windturbinepowercurvefitting> map = InitialRunner.wpcmap.get(wt.getId());
+				if (map.containsKey(speed)) {
+					Windturbinepowercurvefitting wc = map.get(speed);
+
+					double actualpower = wc.getActualpower();
+					// / <summary>
+					// /电量分析主要针对省公司和各风场的每月实际发电量与计划的对比分析，可以查看省公司及各风场每月计划的完成情况和总体的计划完成情况，可以同比和环比进行比较；
+					// /对省公司和各风场的实际发电量与理论发电量的对比分析，利用标准功率曲线中的风速，理论功率，和固定时间段的风频进行统计，设计统计分析公式为：
+					// /理论发电量=（T*f1/f）*P1+（T*f2/f）*P2+…………（T*fn/f）*Pn
+					// /T是选取的时间段；
+					// /f是所有风频的和；
+					// /f1、f2、fn是某风速对应的风频；
+					// /P1、Pn是某风速对应理论曲线上的功率。
+					// /必要性：如果理论电量能够实现计算的准确，调峰电量就可以用理论电量来减去实际电量得出。
+					// /b、可选一段时间内的实际功率和理论功率能够形成曲线形式展示对比,理论功率根据实际风速利用理论功率曲线得出。
+					// /c、风频数据取值时间段需要统一。
+					// / </summary>
+					// / <param name="powerDataList">功率集合</param>
+					// / <param name="hours">时长小时数</param>
+					// / <returns>理论发电量</returns>
+					power = power + new BigDecimal(step).multiply(new BigDecimal(actualpower)).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+				}
+			}
+
+		return StringUtils.round(power, 2);
+	}
+
+	public double getPowerByWp(Map<Double, Integer> speedmap, String wpId, double step) {
+		double power = 0.0;
+		List<Windturbine> wtls=new ArrayList<>();
+		if(wpId.equals(QS))
+		{
+			for(Windturbine wt:InitialRunner.wtallls)
+			{
+				wtls.add(wt);
+			}
+		}else if(wpId.equals(FD)) {
+			for(Windturbine wt:InitialRunner.wtallls)
+			{
+				if (wt.getWindpowerstationid().endsWith("FDC"))
+				{
+					wtls.add(wt);
+				}
+			}
+		}
+		else if (InitialRunner.wp_wtmap.containsKey(wpId)) {
+			wtls = InitialRunner.wp_wtmap.get(wpId);
+		}
+
+			for (Windturbine wt : wtls) {
+				Map<Double, Windturbinepowercurvefitting> map = InitialRunner.wpcmap.get(wt.getId());
+
+				Set<Map.Entry<Double, Integer>> set = speedmap.entrySet();
+				for (Iterator<Map.Entry<Double, Integer>> it = set.iterator(); it.hasNext(); ) {
+					Map.Entry<Double, Integer> entry = (Map.Entry<Double, Integer>) it.next();
+					// System.out.println(entry.getKey() + "--->" +
+					// entry.getValue());
+
+					double speed = entry.getKey() > 24.99 ? entry.getKey() : 24.99;
+					if (null != map && map.containsKey(speed)) {
+						Windturbinepowercurvefitting wc = map.get(speed);
+
+						double actualpower = wc.getActualpower();
+						// / <summary>
+						// /电量分析主要针对省公司和各风场的每月实际发电量与计划的对比分析，可以查看省公司及各风场每月计划的完成情况和总体的计划完成情况，可以同比和环比进行比较；
+						// /对省公司和各风场的实际发电量与理论发电量的对比分析，利用标准功率曲线中的风速，理论功率，和固定时间段的风频进行统计，设计统计分析公式为：
+						// /理论发电量=（T*f1/f）*P1+（T*f2/f）*P2+…………（T*fn/f）*Pn
+						// /T是选取的时间段；
+						// /f是所有风频的和；
+						// /f1、f2、fn是某风速对应的风频；
+						// /P1、Pn是某风速对应理论曲线上的功率。
+						// /必要性：如果理论电量能够实现计算的准确，调峰电量就可以用理论电量来减去实际电量得出。
+						// /b、可选一段时间内的实际功率和理论功率能够形成曲线形式展示对比,理论功率根据实际风速利用理论功率曲线得出。
+						// /c、风频数据取值时间段需要统一。
+						// / </summary>
+						// / <param name="powerDataList">功率集合</param>
+						// / <param name="hours">时长小时数</param>
+						// / <returns>理论发电量</returns>
+
+						power = power + new BigDecimal(step).multiply(new BigDecimal(entry.getValue())).divide(new BigDecimal(speedmap.size()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(actualpower)).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+					}
+				}
+
+			}
+
+		return StringUtils.round(power, 2);
+	}
+
+
+}

src/main/java/com/gyee/frame/service/StopAnalysisDetailService.java

@@ -0,0 +1,142 @@
+package com.gyee.frame.service;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.StopAnalysisDetailMapper;
+import com.gyee.frame.model.auto.StopAnalysisDetail;
+import com.gyee.frame.model.auto.StopAnalysisDetailExample;
+import com.gyee.frame.model.auto.StopAnalysisDetailVo;
+import com.gyee.frame.util.SnowflakeIdWorker;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+
+@Service
+public class StopAnalysisDetailService implements BaseService<StopAnalysisDetail, StopAnalysisDetailExample> {
+	@Resource
+	private StopAnalysisDetailMapper stopAnalysisDetailMapper;
+	@Resource
+	private StopAnalysisDetailVoService stopAnalysisDetailVoService;
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<String> lista=Convert.toListStrArray(ids);
+			StopAnalysisDetailExample example=new StopAnalysisDetailExample();
+			example.createCriteria().andIdIn(lista);
+			return stopAnalysisDetailMapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public StopAnalysisDetail selectByPrimaryKey(String id) {
+				
+			return stopAnalysisDetailMapper.selectByPrimaryKey(id);
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(StopAnalysisDetail record) {
+		return stopAnalysisDetailMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(StopAnalysisDetail record) {
+				
+		//添加雪花主键id
+		record.setId(SnowflakeIdWorker.getUUID());
+			
+				
+		return stopAnalysisDetailMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(StopAnalysisDetail record, StopAnalysisDetailExample example) {
+		
+		return stopAnalysisDetailMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(StopAnalysisDetail record, StopAnalysisDetailExample example) {
+		
+		return stopAnalysisDetailMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<StopAnalysisDetail> selectByExample(StopAnalysisDetailExample example) {
+		
+		return stopAnalysisDetailMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(StopAnalysisDetailExample example) {
+		
+		return stopAnalysisDetailMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(StopAnalysisDetailExample example) {
+		
+		return stopAnalysisDetailMapper.deleteByExample(example);
+	}
+
+	public void saveStopAnalysisDetailList(String mainId,List<StopAnalysisDetailVo> vos) {
+
+		List<StopAnalysisDetail> list=new ArrayList<>();
+
+		//List<StopAnalysisDetailVo> vos=stopAnalysisDetailVoService.findStopAnalysisDetailVoList();
+
+		if(!vos.isEmpty())
+		{
+			for(StopAnalysisDetailVo vo:vos)
+			{
+				StopAnalysisDetail po=new StopAnalysisDetail();
+
+				po.setId(vo.getId());
+				po.setMainid(mainId);
+				po.setPid(vo.getPid());
+				po.setName(vo.getName());
+				po.setJudegvulue(vo.getJudegvulue());
+				po.setUrl(vo.getUrl());
+				po.setIsparent(vo.getIsparent());
+				stopAnalysisDetailMapper.insert(po);
+			}
+		}
+
+	}
+
+	public List<StopAnalysisDetail> findStopAnalysisDetailList(String mainId) {
+
+		List<StopAnalysisDetail> list=new ArrayList<>();
+
+		if (StringUtils.notEmp(mainId) ) {
+
+			StopAnalysisDetailExample example=new StopAnalysisDetailExample();
+			example.setOrderByClause(" rid ");
+
+			StopAnalysisDetailExample.Criteria criteria =example.createCriteria();
+
+
+			criteria.andMainidEqualTo(mainId);
+			list= stopAnalysisDetailMapper.selectByExample(example);
+
+		}
+		return list;
+
+	}
+}

src/main/java/com/gyee/frame/service/StopAnalysisDetailVoService.java

@@ -0,0 +1,130 @@
+package com.gyee.frame.service;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.StopAnalysisDetailVoMapper;
+import com.gyee.frame.model.auto.StopAnalysisDetailVo;
+import com.gyee.frame.model.auto.StopAnalysisDetailVoExample;
+import com.gyee.frame.util.SnowflakeIdWorker;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+
+@Service
+public class StopAnalysisDetailVoService implements BaseService<StopAnalysisDetailVo, StopAnalysisDetailVoExample> {
+	@Resource
+	private StopAnalysisDetailVoMapper stopAnalysisDetailVoMapper;
+	
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<String> lista=Convert.toListStrArray(ids);
+			StopAnalysisDetailVoExample example=new StopAnalysisDetailVoExample();
+			example.createCriteria().andIdIn(lista);
+			return stopAnalysisDetailVoMapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public StopAnalysisDetailVo selectByPrimaryKey(String id) {
+				
+			return stopAnalysisDetailVoMapper.selectByPrimaryKey(id);
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(StopAnalysisDetailVo record) {
+		return stopAnalysisDetailVoMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(StopAnalysisDetailVo record) {
+				
+		//添加雪花主键id
+		record.setId(SnowflakeIdWorker.getUUID());
+			
+				
+		return stopAnalysisDetailVoMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(StopAnalysisDetailVo record, StopAnalysisDetailVoExample example) {
+		
+		return stopAnalysisDetailVoMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(StopAnalysisDetailVo record, StopAnalysisDetailVoExample example) {
+		
+		return stopAnalysisDetailVoMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<StopAnalysisDetailVo> selectByExample(StopAnalysisDetailVoExample example) {
+		
+		return stopAnalysisDetailVoMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(StopAnalysisDetailVoExample example) {
+		
+		return stopAnalysisDetailVoMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(StopAnalysisDetailVoExample example) {
+		
+		return stopAnalysisDetailVoMapper.deleteByExample(example);
+	}
+
+	public int deleteAll() {
+
+		return stopAnalysisDetailVoMapper.deleteAll();
+
+	}
+
+	public List<StopAnalysisDetailVo> findStopAnalysisDetailVoList() {
+
+
+		List<StopAnalysisDetailVo> list=new ArrayList<>();
+
+		StopAnalysisDetailVoExample example=new StopAnalysisDetailVoExample();
+		example.setOrderByClause("id asc");
+
+		list= stopAnalysisDetailVoMapper.selectByExample(example);
+
+		return list;
+
+	}
+
+	public List<StopAnalysisDetailVo> findStopAnalysisDetailVoList(String wtId) {
+
+
+		List<StopAnalysisDetailVo> list=new ArrayList<>();
+
+		StopAnalysisDetailVoExample example=new StopAnalysisDetailVoExample();
+		example.setOrderByClause("id asc");
+		StopAnalysisDetailVoExample.Criteria criteria =example.createCriteria();
+
+		criteria.andWtidEqualTo(wtId);
+		list= stopAnalysisDetailVoMapper.selectByExample(example);
+
+		return list;
+
+	}
+}

src/main/java/com/gyee/frame/service/StopAnalysisService.java

@@ -0,0 +1,111 @@
+package com.gyee.frame.service;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.StopAnalysisMapper;
+import com.gyee.frame.model.auto.StopAnalysis;
+import com.gyee.frame.model.auto.StopAnalysisExample;
+import com.gyee.frame.util.SnowflakeIdWorker;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+
+@Service
+public class StopAnalysisService implements BaseService<StopAnalysis, StopAnalysisExample> {
+	@Resource
+	private StopAnalysisMapper stopAnalysisMapper;
+	
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<String> lista=Convert.toListStrArray(ids);
+			StopAnalysisExample example=new StopAnalysisExample();
+			example.createCriteria().andIdIn(lista);
+			return stopAnalysisMapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public StopAnalysis selectByPrimaryKey(String id) {
+				
+			return stopAnalysisMapper.selectByPrimaryKey(id);
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(StopAnalysis record) {
+		return stopAnalysisMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(StopAnalysis record) {
+				
+
+				
+		return stopAnalysisMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(StopAnalysis record, StopAnalysisExample example) {
+		
+		return stopAnalysisMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(StopAnalysis record, StopAnalysisExample example) {
+		
+		return stopAnalysisMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<StopAnalysis> selectByExample(StopAnalysisExample example) {
+		
+		return stopAnalysisMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(StopAnalysisExample example) {
+		
+		return stopAnalysisMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(StopAnalysisExample example) {
+		
+		return stopAnalysisMapper.deleteByExample(example);
+	}
+
+	public List<StopAnalysis> findStopAnalysis(String wpId, String modelId, String typeId) {
+
+
+		List<StopAnalysis> list=new ArrayList<>();
+
+		if(StringUtils.notEmp(wpId) && StringUtils.notEmp(modelId) && StringUtils.notEmp(typeId))
+		{
+			StopAnalysisExample example=new StopAnalysisExample();
+			example.setOrderByClause("wpid asc");
+
+
+			list= stopAnalysisMapper.selectByExample(example);
+		}
+
+		return list;
+
+	}
+}

src/main/java/com/gyee/frame/service/StopAnalysismainService.java

@@ -0,0 +1,138 @@
+package com.gyee.frame.service;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.StopAnalysismainMapper;
+import com.gyee.frame.model.auto.*;
+import com.gyee.frame.util.SnowflakeIdWorker;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+
+@Service
+public class StopAnalysismainService implements BaseService<StopAnalysismain, StopAnalysismainExample> {
+	@Resource
+	private StopAnalysismainMapper stopAnalysismainMapper;
+
+	@Resource
+	private StopAnalysismainVoService stopAnalysismainVoService;
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<String> lista=Convert.toListStrArray(ids);
+			StopAnalysismainExample example=new StopAnalysismainExample();
+			example.createCriteria().andIdIn(lista);
+			return stopAnalysismainMapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public StopAnalysismain selectByPrimaryKey(String id) {
+				
+			return stopAnalysismainMapper.selectByPrimaryKey(id);
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(StopAnalysismain record) {
+		return stopAnalysismainMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(StopAnalysismain record) {
+				
+		//添加雪花主键id
+		record.setId(SnowflakeIdWorker.getUUID());
+			
+				
+		return stopAnalysismainMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(StopAnalysismain record, StopAnalysismainExample example) {
+		
+		return stopAnalysismainMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(StopAnalysismain record, StopAnalysismainExample example) {
+		
+		return stopAnalysismainMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<StopAnalysismain> selectByExample(StopAnalysismainExample example) {
+		
+		return stopAnalysismainMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(StopAnalysismainExample example) {
+		
+		return stopAnalysismainMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(StopAnalysismainExample example) {
+		
+		return stopAnalysismainMapper.deleteByExample(example);
+	}
+
+	public void saveStopAnalysismainList(String mainId,List<StopAnalysismainVo> vos) {
+
+		List<StopAnalysismain> list=new ArrayList<>();
+
+		//List<StopAnalysismainVo> vos=stopAnalysismainVoService.findStopAnalysismainVoList();
+
+		if(!vos.isEmpty())
+		{
+			for(StopAnalysismainVo vo:vos)
+			{
+				StopAnalysismain po=new StopAnalysismain();
+
+				po.setId(vo.getId());
+				po.setMainid(mainId);
+				po.setModelid(vo.getModelid());
+				po.setWtid(vo.getWtid());
+				po.setJudegvulue(vo.getJudegvulue());
+
+				stopAnalysismainMapper.insert(po);
+			}
+		}
+
+	}
+
+	public List<StopAnalysismain> findStopAnalysismainList(String mainId) {
+
+		List<StopAnalysismain> list=new ArrayList<>();
+
+		if (StringUtils.notEmp(mainId) ) {
+
+			StopAnalysismainExample example=new StopAnalysismainExample();
+			example.setOrderByClause(" wtId ");
+
+			StopAnalysismainExample.Criteria criteria =example.createCriteria();
+
+			criteria.andMainidEqualTo(mainId);
+			list= stopAnalysismainMapper.selectByExample(example);
+
+		}
+		return list;
+
+	}
+}

src/main/java/com/gyee/frame/service/StopAnalysismainVoService.java

@@ -0,0 +1,120 @@
+package com.gyee.frame.service;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.StopAnalysismainVoMapper;
+import com.gyee.frame.model.auto.StopAnalysismainVo;
+import com.gyee.frame.model.auto.StopAnalysismainVoExample;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 风机信息表 StopAnalysismainVoService
+ * @Title: StopAnalysismainVoService.java 
+ * @Package com.gyee.frame.service 
+ * @author gyee_自动生成
+ * @email 1@qq.com
+ * @date 2019-12-30 17:00:04  
+ **/
+@Service
+public class StopAnalysismainVoService implements BaseService<StopAnalysismainVo, StopAnalysismainVoExample> {
+	@Resource
+	private StopAnalysismainVoMapper stopAnalysismainVoMapper;
+	
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<String> lista=Convert.toListStrArray(ids);
+			StopAnalysismainVoExample example=new StopAnalysismainVoExample();
+			example.createCriteria().andIdIn(lista);
+			return stopAnalysismainVoMapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public StopAnalysismainVo selectByPrimaryKey(String id) {
+				
+			return stopAnalysismainVoMapper.selectByPrimaryKey(id);
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(StopAnalysismainVo record) {
+		return stopAnalysismainVoMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(StopAnalysismainVo record) {
+				
+
+			
+				
+		return stopAnalysismainVoMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(StopAnalysismainVo record, StopAnalysismainVoExample example) {
+		
+		return stopAnalysismainVoMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(StopAnalysismainVo record, StopAnalysismainVoExample example) {
+		
+		return stopAnalysismainVoMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<StopAnalysismainVo> selectByExample(StopAnalysismainVoExample example) {
+		
+		return stopAnalysismainVoMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(StopAnalysismainVoExample example) {
+		
+		return stopAnalysismainVoMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(StopAnalysismainVoExample example) {
+		
+		return stopAnalysismainVoMapper.deleteByExample(example);
+	}
+
+
+	public int deleteAll() {
+
+		return stopAnalysismainVoMapper.deleteAll();
+
+	}
+
+	public List<StopAnalysismainVo> findStopAnalysismainVoList() {
+
+
+		List<StopAnalysismainVo> list=new ArrayList<>();
+
+		StopAnalysismainVoExample example=new StopAnalysismainVoExample();
+		example.setOrderByClause("wtid asc");
+
+		list= stopAnalysismainVoMapper.selectByExample(example);
+
+		return list;
+
+	}
+}

src/main/java/com/gyee/frame/service/WtReportSubService.java

@@ -7,9 +7,9 @@ import com.gyee.frame.model.auto.WtReportSub;
 import com.gyee.frame.model.auto.WtReportSubExample;
 import com.gyee.frame.util.SnowflakeIdWorker;
 import com.gyee.frame.util.StringUtils;
-import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -93,7 +93,7 @@ public class WtReportSubService implements BaseService<WtReportSub, WtReportSubE
 		return wtReportSubMapper.deleteByExample(example);
 	}
 
-	public List<WtReportSub> healthReportsub(String tid) {
+	public List<WtReportSub> findWtReportSubList(String tid) {
 
 
 		List<WtReportSub> list=new ArrayList<>();

src/main/java/com/gyee/frame/service/health/HealthMainService.java

@@ -32,6 +32,8 @@ public class HealthMainService {
     private WeatherService weatherService;
     @Resource
     private WeatherDay5Service weatherDay5Service;
+    @Resource
+    private PowerToPowerService powerToPowerService;
 
     private final int digit = 2;
     private final double NUM = 3.6;
@@ -609,8 +611,8 @@ public class HealthMainService {
                         Map<String,Object> wh=weatherls.get(i);
 
                         double fs=(double)wh.get("fs");
-                        ycdl15minute = StringUtils.round(getPowerByWp(fs, wpId, 1) * 0.25, 2);
-                        ycdl1hour = getPowerByWp(fs, wpId, 1);
+                        ycdl15minute = StringUtils.round(powerToPowerService.getPowerByWp(fs, wpId, 1) * 0.25, 2);
+                        ycdl1hour = powerToPowerService.getPowerByWp(fs, wpId, 1);
 
                         if (speedmap.containsKey(fs)) {
                             int temp = speedmap.get(fs) + 1;
@@ -620,7 +622,7 @@ public class HealthMainService {
                         }
 
                     }
-                    ycdl1day = getPowerByWp(speedmap, wpId, 1);
+                    ycdl1day = powerToPowerService.getPowerByWp(speedmap, wpId, 1);
                     }
                 }
 //                List<Weatherfh> wfhls = weatherfhService.findWeatherfh(beginDate, endDate, wpId);
@@ -681,7 +683,7 @@ public class HealthMainService {
 
                     }
 
-                    ycdl1month = getPowerByWp(speedmap, wpId, 24);
+                    ycdl1month = powerToPowerService.getPowerByWp(speedmap, wpId, 24);
 
                 }
 
@@ -874,84 +876,84 @@ public class HealthMainService {
     }
 
 
-    private double getPowerByWp(double speed, String wpId, double step) {
-        double power = 0.0;
-
-        if (InitialRunner.wp_wtmap.containsKey(wpId)) {
-            List<Windturbine> wtls = InitialRunner.wp_wtmap.get(wpId);
-            for (Windturbine wt : wtls) {
-                Map<Double, Windturbinepowercurvefitting> map = InitialRunner.wpcmap.get(wt.getId());
-                if (map.containsKey(speed)) {
-                    Windturbinepowercurvefitting wc = map.get(speed);
-
-                    double actualpower = wc.getActualpower();
-                    // / <summary>
-                    // /电量分析主要针对省公司和各风场的每月实际发电量与计划的对比分析，可以查看省公司及各风场每月计划的完成情况和总体的计划完成情况，可以同比和环比进行比较；
-                    // /对省公司和各风场的实际发电量与理论发电量的对比分析，利用标准功率曲线中的风速，理论功率，和固定时间段的风频进行统计，设计统计分析公式为：
-                    // /理论发电量=（T*f1/f）*P1+（T*f2/f）*P2+…………（T*fn/f）*Pn
-                    // /T是选取的时间段；
-                    // /f是所有风频的和；
-                    // /f1、f2、fn是某风速对应的风频；
-                    // /P1、Pn是某风速对应理论曲线上的功率。
-                    // /必要性：如果理论电量能够实现计算的准确，调峰电量就可以用理论电量来减去实际电量得出。
-                    // /b、可选一段时间内的实际功率和理论功率能够形成曲线形式展示对比,理论功率根据实际风速利用理论功率曲线得出。
-                    // /c、风频数据取值时间段需要统一。
-                    // / </summary>
-                    // / <param name="powerDataList">功率集合</param>
-                    // / <param name="hours">时长小时数</param>
-                    // / <returns>理论发电量</returns>
-                    power = power + new BigDecimal(step).multiply(new BigDecimal(actualpower)).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
-
-                }
-            }
-        }
-        return StringUtils.round(power, 2);
-    }
-
-    private double getPowerByWp(Map<Double, Integer> speedmap, String wpId, double step) {
-        double power = 0.0;
-
-        if (InitialRunner.wp_wtmap.containsKey(wpId)) {
-            List<Windturbine> wtls = InitialRunner.wp_wtmap.get(wpId);
-            for (Windturbine wt : wtls) {
-                Map<Double, Windturbinepowercurvefitting> map = InitialRunner.wpcmap.get(wt.getId());
-
-                Set<Map.Entry<Double, Integer>> set = speedmap.entrySet();
-                for (Iterator<Map.Entry<Double, Integer>> it = set.iterator(); it.hasNext(); ) {
-                    Map.Entry<Double, Integer> entry = (Map.Entry<Double, Integer>) it.next();
-                    // System.out.println(entry.getKey() + "--->" +
-                    // entry.getValue());
-
-                    double speed = entry.getKey() > 24.99 ? entry.getKey() : 24.99;
-                    if (null != map && map.containsKey(speed)) {
-                        Windturbinepowercurvefitting wc = map.get(speed);
-
-                        double actualpower = wc.getActualpower();
-                        // / <summary>
-                        // /电量分析主要针对省公司和各风场的每月实际发电量与计划的对比分析，可以查看省公司及各风场每月计划的完成情况和总体的计划完成情况，可以同比和环比进行比较；
-                        // /对省公司和各风场的实际发电量与理论发电量的对比分析，利用标准功率曲线中的风速，理论功率，和固定时间段的风频进行统计，设计统计分析公式为：
-                        // /理论发电量=（T*f1/f）*P1+（T*f2/f）*P2+…………（T*fn/f）*Pn
-                        // /T是选取的时间段；
-                        // /f是所有风频的和；
-                        // /f1、f2、fn是某风速对应的风频；
-                        // /P1、Pn是某风速对应理论曲线上的功率。
-                        // /必要性：如果理论电量能够实现计算的准确，调峰电量就可以用理论电量来减去实际电量得出。
-                        // /b、可选一段时间内的实际功率和理论功率能够形成曲线形式展示对比,理论功率根据实际风速利用理论功率曲线得出。
-                        // /c、风频数据取值时间段需要统一。
-                        // / </summary>
-                        // / <param name="powerDataList">功率集合</param>
-                        // / <param name="hours">时长小时数</param>
-                        // / <returns>理论发电量</returns>
-
-                        power = power + new BigDecimal(step).multiply(new BigDecimal(entry.getValue())).divide(new BigDecimal(speedmap.size()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(actualpower)).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
-
-                    }
-                }
-
-            }
-        }
-        return StringUtils.round(power, 2);
-    }
+//    private double getPowerByWp(double speed, String wpId, double step) {
+//        double power = 0.0;
+//
+//        if (InitialRunner.wp_wtmap.containsKey(wpId)) {
+//            List<Windturbine> wtls = InitialRunner.wp_wtmap.get(wpId);
+//            for (Windturbine wt : wtls) {
+//                Map<Double, Windturbinepowercurvefitting> map = InitialRunner.wpcmap.get(wt.getId());
+//                if (map.containsKey(speed)) {
+//                    Windturbinepowercurvefitting wc = map.get(speed);
+//
+//                    double actualpower = wc.getActualpower();
+//                    // / <summary>
+//                    // /电量分析主要针对省公司和各风场的每月实际发电量与计划的对比分析，可以查看省公司及各风场每月计划的完成情况和总体的计划完成情况，可以同比和环比进行比较；
+//                    // /对省公司和各风场的实际发电量与理论发电量的对比分析，利用标准功率曲线中的风速，理论功率，和固定时间段的风频进行统计，设计统计分析公式为：
+//                    // /理论发电量=（T*f1/f）*P1+（T*f2/f）*P2+…………（T*fn/f）*Pn
+//                    // /T是选取的时间段；
+//                    // /f是所有风频的和；
+//                    // /f1、f2、fn是某风速对应的风频；
+//                    // /P1、Pn是某风速对应理论曲线上的功率。
+//                    // /必要性：如果理论电量能够实现计算的准确，调峰电量就可以用理论电量来减去实际电量得出。
+//                    // /b、可选一段时间内的实际功率和理论功率能够形成曲线形式展示对比,理论功率根据实际风速利用理论功率曲线得出。
+//                    // /c、风频数据取值时间段需要统一。
+//                    // / </summary>
+//                    // / <param name="powerDataList">功率集合</param>
+//                    // / <param name="hours">时长小时数</param>
+//                    // / <returns>理论发电量</returns>
+//                    power = power + new BigDecimal(step).multiply(new BigDecimal(actualpower)).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+//
+//                }
+//            }
+//        }
+//        return StringUtils.round(power, 2);
+//    }
+//
+//    private double getPowerByWp(Map<Double, Integer> speedmap, String wpId, double step) {
+//        double power = 0.0;
+//
+//        if (InitialRunner.wp_wtmap.containsKey(wpId)) {
+//            List<Windturbine> wtls = InitialRunner.wp_wtmap.get(wpId);
+//            for (Windturbine wt : wtls) {
+//                Map<Double, Windturbinepowercurvefitting> map = InitialRunner.wpcmap.get(wt.getId());
+//
+//                Set<Map.Entry<Double, Integer>> set = speedmap.entrySet();
+//                for (Iterator<Map.Entry<Double, Integer>> it = set.iterator(); it.hasNext(); ) {
+//                    Map.Entry<Double, Integer> entry = (Map.Entry<Double, Integer>) it.next();
+//                    // System.out.println(entry.getKey() + "--->" +
+//                    // entry.getValue());
+//
+//                    double speed = entry.getKey() > 24.99 ? entry.getKey() : 24.99;
+//                    if (null != map && map.containsKey(speed)) {
+//                        Windturbinepowercurvefitting wc = map.get(speed);
+//
+//                        double actualpower = wc.getActualpower();
+//                        // / <summary>
+//                        // /电量分析主要针对省公司和各风场的每月实际发电量与计划的对比分析，可以查看省公司及各风场每月计划的完成情况和总体的计划完成情况，可以同比和环比进行比较；
+//                        // /对省公司和各风场的实际发电量与理论发电量的对比分析，利用标准功率曲线中的风速，理论功率，和固定时间段的风频进行统计，设计统计分析公式为：
+//                        // /理论发电量=（T*f1/f）*P1+（T*f2/f）*P2+…………（T*fn/f）*Pn
+//                        // /T是选取的时间段；
+//                        // /f是所有风频的和；
+//                        // /f1、f2、fn是某风速对应的风频；
+//                        // /P1、Pn是某风速对应理论曲线上的功率。
+//                        // /必要性：如果理论电量能够实现计算的准确，调峰电量就可以用理论电量来减去实际电量得出。
+//                        // /b、可选一段时间内的实际功率和理论功率能够形成曲线形式展示对比,理论功率根据实际风速利用理论功率曲线得出。
+//                        // /c、风频数据取值时间段需要统一。
+//                        // / </summary>
+//                        // / <param name="powerDataList">功率集合</param>
+//                        // / <param name="hours">时长小时数</param>
+//                        // / <returns>理论发电量</returns>
+//
+//                        power = power + new BigDecimal(step).multiply(new BigDecimal(entry.getValue())).divide(new BigDecimal(speedmap.size()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(actualpower)).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+//
+//                    }
+//                }
+//
+//            }
+//        }
+//        return StringUtils.round(power, 2);
+//    }
 
 
     public Map<String, Object> findHealthMatrixMap() throws Exception {

src/main/java/com/gyee/frame/service/health/HealthSubService.java

@@ -638,52 +638,65 @@ public class HealthSubService {
 
         Calendar cal = Calendar.getInstance();
 
+        //        cal.set(Calendar.HOUR_OF_DAY, 0);
+
+
         cal.set(Calendar.HOUR_OF_DAY, 0);
         cal.set(Calendar.MINUTE, 0);
         cal.set(Calendar.SECOND, 0);
-
-        end[0] = cal.get(Calendar.YEAR);
-        end[1] = cal.get(Calendar.MONTH);
-        end[2] = cal.get(Calendar.DAY_OF_MONTH);
-        Date endDate = cal.getTime();
-        int length = 30;
-        cal.add(Calendar.DAY_OF_MONTH, -30);
+        cal.set(Calendar.MILLISECOND,0);
         Date beginDate = cal.getTime();
 
         begin[0] = cal.get(Calendar.YEAR);
         begin[1] = cal.get(Calendar.MONTH);
         begin[2] = cal.get(Calendar.DAY_OF_MONTH);
 
+        cal.add(Calendar.DAY_OF_MONTH,1);
+
+        end[0] = cal.get(Calendar.YEAR);
+        end[1] = cal.get(Calendar.MONTH);
+        end[2] = cal.get(Calendar.DAY_OF_MONTH);
+        Date endDate = cal.getTime();
+
+        int length = DateUtils.minutesDiff(beginDate,endDate)/3;
         Double[] sjglarr = new Double[length];
         Double[] llglarr = new Double[length];
         Double[] sjfsarr = new Double[length];
         Long[] timearr = new Long[length];
+
+        cal = Calendar.getInstance();
+        cal.setTime(beginDate);
+        for(int i=0;i<length;i++)
+        {
+            timearr[i]=cal.getTime().getTime();
+            cal.add(Calendar.MINUTE,3);
+        }
         WindTurbineTestingPointAi2 sjgl = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.TPOINT_WT_FJGL);
 
-        List<PointData> sjglls = realApiUtil.getHistoryDatasSnap(sjgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 24 * 3600L);
+        List<PointData> sjglls = realApiUtil.getHistoryDatasSnap(sjgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 180L);
 
         if (!sjglls.isEmpty()) {
-            for (int i = 0; i < sjglls.size() - 1; i++) {
-                timearr[i]=sjglls.get(i).getPointTime();
+            for (int i = 0; i < sjglls.size() ; i++) {
+               // timearr[i]=sjglls.get(i).getPointTime()*1000;
                 sjglarr[i] = MathUtil.twoBit(sjglls.get(i).getPointValueInDouble());
             }
         }
         WindTurbineTestingPointAi2 llgl = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.TPOINT_WT_LLGL);
 
-        List<PointData> llglls = realApiUtil.getHistoryDatasSnap(llgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 24 * 3600L);
+        List<PointData> llglls = realApiUtil.getHistoryDatasSnap(llgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 180L);
 
         if (!llglls.isEmpty()) {
-            for (int i = 0; i < llglls.size() - 1; i++) {
+            for (int i = 0; i < llglls.size() ; i++) {
                 llglarr[i] = MathUtil.twoBit(llglls.get(i).getPointValueInDouble());
             }
         }
 
         WindTurbineTestingPointAi2 ssfs = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.TPOINT_WT_FJSSFS);
 
-        List<PointData> ssfsls = realApiUtil.getHistoryDatasSnap(ssfs, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 24 * 3600L);
+        List<PointData> ssfsls = realApiUtil.getHistoryDatasSnap(ssfs, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 180L);
 
         if (!ssfsls.isEmpty()) {
-            for (int i = 0; i < ssfsls.size() - 1; i++) {
+            for (int i = 0; i < ssfsls.size() ; i++) {
                 sjfsarr[i] = MathUtil.twoBit(ssfsls.get(i).getPointValueInDouble());
             }
         }
@@ -692,6 +705,7 @@ public class HealthSubService {
         resultmap.put("llgl", llglarr);
         resultmap.put("ssfs", sjfsarr);
         resultmap.put("timearr", timearr);
+
         resultmap.put("begin", begin);
         resultmap.put("end", end);
 
@@ -880,6 +894,12 @@ public class HealthSubService {
             double mttr = new BigDecimal(stophours).divide(new BigDecimal(num), 2, RoundingMode.HALF_EVEN).doubleValue();
             double loss = new BigDecimal(losspowers).divide(new BigDecimal(num), 2, RoundingMode.HALF_EVEN).doubleValue();
 
+            if(mtbf<0)
+            {
+                mtbf=0;
+                strs[3]=String.valueOf(0.0);
+            }
+
             if(null!=fristStopTime && mtbf!=0)
             {
                 //最近一次故障距离当前时间

src/main/java/com/gyee/frame/service/recommen/RecommenService.java

@@ -50,6 +50,9 @@ public class RecommenService {
 	@Resource
 	private WindturbineSqlService windturbineSqlService;
 
+	@Resource
+	private EliminatingeqService eliminatingeqService;
+
 	private final String QS = "0";
 	private final String FD = "-1";
 	private final String GF = "-2";
@@ -242,21 +245,22 @@ public class RecommenService {
 					num=12;
 					break;
 				case "2":
-					cal.add(Calendar.DAY_OF_MONTH, 0);
+					cal.add(Calendar.DAY_OF_MONTH, 1);
 					cal.set(Calendar.HOUR_OF_DAY, 0);
 					cal.set(Calendar.MINUTE, 0);
 					cal.set(Calendar.SECOND, 0);
-
+					cal.set(Calendar.MILLISECOND, 0);
 					//  uniformcode = Constant.YCFJJKZT7DAY;
 					uniformcode = Constant.YCFJJKZT1MONTH;
 					num=7;
 					break;
 
 				case "3":
-					cal.add(Calendar.DAY_OF_MONTH, 0);
+					cal.add(Calendar.DAY_OF_MONTH, 1);
 					cal.set(Calendar.HOUR_OF_DAY, 0);
 					cal.set(Calendar.MINUTE, 0);
 					cal.set(Calendar.SECOND, 0);
+					cal.set(Calendar.MILLISECOND, 0);
 					uniformcode = Constant.YCFJJKZT1MONTH;
 					num=30;
 					break;
@@ -321,7 +325,8 @@ public class RecommenService {
 				jkd = 0.0;
 
 
-				int recodeDate = new BigDecimal(cal.getTime().getTime()).divide(new BigDecimal(1000), 0, RoundingMode.HALF_EVEN).intValue();
+
+				int recodeDate = new BigDecimal(cal.getTime().getTime()).divide(new BigDecimal(1000), 0, RoundingMode.DOWN).intValue();
 
 				// 获得风机健康状态结果数组
 				DNAVal[] jkvalues = realApiUtil.getHistMatrix(jkpoints, recodeDate);
@@ -628,12 +633,44 @@ public class RecommenService {
 	 * 通过位置编号获得缺陷单信息
 	 * @return
 	 */
-	public List<Wobugeq> findWobugeqByLocation(Tablepar tablepar,String location, Date beginDate, Date endDate) {
+	public List<WoBugVo> findWobugeqByLocation(Tablepar tablepar,String location, Date beginDate, Date endDate) {
 
-		List<Wobugeq> vos=new ArrayList<>();
+		List<WoBugVo>	vos =new ArrayList<>();
 		if (StringUtils.notEmp(tablepar) && StringUtils.notEmp(location) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate) ) {
 
-			vos=wobugeqService.findWobugeqByLocation(tablepar,location, beginDate, endDate);
+			List<Wobugeq> list=wobugeqService.findWobugeqByLocation(tablepar,location, beginDate, endDate);
+
+			if (!list.isEmpty()) {
+
+				for (Wobugeq wb : list) {
+					if (StringUtils.notEmp(wb.getBugnum())) {
+						List<Eliminatingeq> ells = eliminatingeqService.findEliminatingeqById(wb.getBugnum());
+						if (!ells.isEmpty()) {
+							for (Eliminatingeq el : ells) {
+								WoBugVo vo = new WoBugVo();
+								vo.setXqbh(wb.getBugnum());
+								vo.setXqms(wb.getDescription());
+								vo.setXqsj(wb.getFindtime());
+								vo.setXqry(wb.getFindlabornum());
+								vo.setStatus(1);
+								vo.setGhbj(el.getSparename());
+								vo.setGhyy(el.getDescription());
+								vo.setGhsl(el.getNumber());
+								vos.add(vo);
+							}
+						} else {
+							WoBugVo vo = new WoBugVo();
+							vo.setXqbh(wb.getBugnum());
+							vo.setXqms(wb.getDescription());
+							vo.setXqsj(wb.getFindtime());
+							vo.setXqry(wb.getFindlabornum());
+							vo.setStatus(0);
+							vos.add(vo);
+						}
+					}
+
+				}
+			}
 		}
 		return vos;
 	}

src/main/java/com/gyee/frame/service/stopanalysis/StopAnalysisStaticService.java

@@ -0,0 +1,335 @@
+package com.gyee.frame.service.stopanalysis;
+
+import com.gyee.frame.common.spring.Constant;
+import com.gyee.frame.common.spring.InitialRunner;
+import com.gyee.frame.model.auto.*;
+import com.gyee.frame.model.custom.DNAVal;
+import com.gyee.frame.model.custom.PointData;
+import com.gyee.frame.model.custom.StopAnalysisNodeVo;
+import com.gyee.frame.service.*;
+import com.gyee.frame.util.IRealTimeDataBaseUtil;
+import com.gyee.frame.util.RealTimeDataBaseFactory;
+import com.gyee.frame.util.SnowflakeIdWorker;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.security.SecureRandom;
+import java.util.*;
+
+
+@Service
+public class StopAnalysisStaticService {
+
+
+    @Resource
+    private WindTurbineTestingPointAiService windTurbineTestingPointAiService;
+    @Resource
+    private EquipmentSqlService equipmentSqlService;
+    @Resource
+    private MismapSqlService mismapSqlService;
+    @Resource
+    private WindturbineSqlService windturbineSqlService;
+    @Resource
+    private StopAnalysisService stopAnalysisService;
+    @Resource
+    private StopAnalysismainService stopAnalysismainService;
+    @Resource
+    private StopAnalysismainVoService stopAnalysismainVoService;
+    @Resource
+    private StopAnalysisDetailService stopAnalysisDetailService;
+    @Resource
+    private StopAnalysisDetailVoService stopAnalysisDetailVoService;
+
+    private final String ZC = "正常";
+    private final String ZY = "注意";
+    private final String GZ = "关注";
+
+    IRealTimeDataBaseUtil realApiUtil = RealTimeDataBaseFactory.createRealTimeDataBase();
+
+    public List<StopAnalysismainVo> stopAnalysisList(String wpId, String modelId, String typeId) throws Exception {
+
+        List<StopAnalysismainVo> vos = new ArrayList<>();
+
+        if (StringUtils.notEmp(wpId) && StringUtils.notEmp(modelId) && StringUtils.notEmp(typeId)) {
+
+            stopAnalysismainVoService.deleteAll();
+            stopAnalysisDetailVoService.deleteAll();
+            List<Windturbine> wtls = InitialRunner.wp_wtmap.get(wpId);
+
+            if (typeId.equals("1")) {
+                List<String> wtidls = new ArrayList<String>();
+                List<String> codejkls = new ArrayList<String>();
+                List<String> codeztls = new ArrayList<String>();
+                for (Windturbine wt : wtls) {
+
+                    wtidls.add(wt.getId());
+                    codejkls.add(Constant.FJJKZZ);
+                    codeztls.add(Constant.FJZT);
+
+                }
+
+                String[] jkpoints = new String[wtidls.size()];
+                String[] ztpoints = new String[wtidls.size()];
+
+                // 获得训练参数对象
+                for (int x = 0; x < wtidls.size(); x++) {
+
+                    WindTurbineTestingPointAi2 ai1 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), codejkls.get(x));
+                    jkpoints[x] = ai1.getId();
+                    WindTurbineTestingPointAi2 ai2 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtidls.get(x), codeztls.get(x));
+                    ztpoints[x] = ai2.getId();
+
+                }
+
+                // 获得风机健康状态结果数组
+                DNAVal[] jkvalues = realApiUtil.getRealtimeTagValues(jkpoints);
+                // 获得风机实时状态结果数组
+                DNAVal[] ztvalues = realApiUtil.getRealtimeTagValues(ztpoints);
+
+                for (int x = 0; x < wtls.size(); x++) {
+                    Windturbine wt = wtls.get(x);
+                    String wtId = wt.getId();
+                    double jk = jkvalues[x].DValue;
+                    double zt = ztvalues[x].DValue;
+                    StopAnalysismainVo vo = new StopAnalysismainVo();
+                    vo.setWtid(wt.getId());
+                    vo.setModelid(wt.getModelid());
+                    if (zt == 2.0) {
+                        vo.setModelid(GZ);
+                    } else {
+                        vo.setJudegvulue(getJudgeVaue(jk));
+                    }
+                    //添加雪花主键id
+                    String id=SnowflakeIdWorker.getUUID();
+                    vo.setId(id);
+                    stopAnalysismainVoService.insertSelective(vo);
+
+                    saveLocationTreeByWtId(id,wtId,vo.getJudegvulue());
+                    vos.add(vo);
+                }
+
+            } else if (typeId.equals("2")) {
+                Calendar c = Calendar.getInstance();
+
+                c.set(Calendar.SECOND, 0);
+                c.set(Calendar.MILLISECOND, 0);
+                Date endDate = c.getTime();
+                c.add(Calendar.MINUTE, -10);
+                Date beginDate = c.getTime();
+
+                for (int x = 0; x < wtls.size(); x++) {
+                    Windturbine wt = wtls.get(x);
+                    String wtId = wt.getId();
+                    StopAnalysismainVo vo = new StopAnalysismainVo();
+                    vo.setWtid(wt.getId());
+                    vo.setModelid(wt.getModelid());
+
+                    WindTurbineTestingPointAi2 ai1 = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, Constant.FJJKZZ);
+                    List<PointData> pointls = realApiUtil.getHistoryDatasSnap(ai1, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) 10, 60L);
+
+                    if (!pointls.isEmpty()) {
+                        double csl = 0.0;
+                        double lsl = 0.0;
+                        double ysl = 0.0;
+                        for (PointData point : pointls) {
+                            double jk = point.getPointValueInDouble();
+
+                            if (jk == 4.0) {
+
+                                csl++;
+                                break;
+                            } else if (jk == 3.0) {
+
+                                lsl++;
+                            } else if (jk == 2.0 || jk == 1.0) {
+
+                                ysl++;
+                            } else {
+
+                                ysl++;
+                            }
+                        }
+
+                        if (csl != 0) {
+                            vo.setJudegvulue(GZ);
+                        } else if (lsl >= ysl) {
+                            vo.setJudegvulue(ZY);
+                        } else {
+                            vo.setJudegvulue(ZC);
+                        }
+
+                    } else {
+                        vo.setJudegvulue(ZC);
+                    }
+                    //添加雪花主键id
+                    String id=SnowflakeIdWorker.getUUID();
+                    vo.setId(id);
+                    stopAnalysismainVoService.insertSelective(vo);
+                    saveLocationTreeByWtId(id,wtId,vo.getJudegvulue());
+                    vos.add(vo);
+                }
+
+            }
+
+        }
+        return vos;
+    }
+
+    private String getJudgeVaue(double values) {
+        if (values >= 60) {
+            return ZC;
+        } else if (values < 60 && values >= 30) {
+            return ZY;
+        } else {
+            return GZ;
+        }
+
+
+    }
+
+
+
+    private List<StopAnalysisNodeVo> saveLocationTreeByWtId(String mainId,String wtId, String values) throws Exception {
+
+        List<StopAnalysisNodeVo> vos = new ArrayList<>();
+        if (StringUtils.notEmp(wtId)) {
+
+
+            List<String> codels = new ArrayList<String>();
+            codels.add(Constant.CLXJKZT);
+            codels.add(Constant.FDJJKZT);
+            codels.add(Constant.BJJKZT);
+            codels.add(Constant.ZKJKZT);
+
+
+            String[] points = new String[codels.size()];
+
+            for (int i = 0; i < codels.size(); i++) {
+
+                WindTurbineTestingPointAi2 ai = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId, codels.get(i));
+                points[i] = ai.getId();
+            }
+
+            // 获得风机健康状态结果数组
+            DNAVal[] jkvalues = realApiUtil.getRealtimeTagValues(points);
+
+
+            //随机生成诊断等级
+            if (values.equals(2)) {
+                Random random = new SecureRandom();
+                int index = random.nextInt(4);
+                jkvalues[index].DValue = 50.0;
+            } else if (values.equals(3)) {
+                Random random = new SecureRandom();
+                int index = random.nextInt(4);
+                jkvalues[index].DValue = 20.0;
+            }
+
+            String clxzt = getJudgeVaue(jkvalues[0].DValue);
+            String fdjzt = getJudgeVaue(jkvalues[1].DValue);
+            String bjzt = getJudgeVaue(jkvalues[2].DValue);
+            String zkzt = getJudgeVaue(jkvalues[3].DValue);
+
+
+            MismapSql mis = mismapSqlService.findMismapSqlById(wtId);
+            String wtNum = mis.getMiskey();
+            WindturbineSql wt = windturbineSqlService.findWindturbineById(wtNum);
+
+            if (StringUtils.notEmp(wt) && StringUtils.notEmp(wt.getLocation())) {
+
+                List<EquipmentSql> eqls = equipmentSqlService.getEquipmentListByLocation(wt.getLocation());
+                if (!eqls.isEmpty()) {
+                    List<StopAnalysisDetailVo> nodes = new ArrayList<StopAnalysisDetailVo>();
+                    for (EquipmentSql eq : eqls) {
+                        StopAnalysisDetailVo node = new StopAnalysisDetailVo();
+                        node.setId(eq.getLocation());
+                        node.setPid(eq.getParent());
+                        node.setName(eq.getDescription());
+                        node.setWtid(wtId);
+                        if (eq.getDescription().indexOf("齿轮箱") != -1) {
+                            node.setJudegvulue(clxzt);
+                        } else if (eq.getDescription().indexOf("发电机") != -1) {
+                            node.setJudegvulue(fdjzt);
+                        } else if (eq.getDescription().indexOf("变桨") != -1) {
+                            node.setJudegvulue(bjzt);
+                        } else if (eq.getDescription().indexOf("塔") != -1) {
+                            node.setJudegvulue(zkzt);
+                        } else {
+                            node.setJudegvulue(ZC);
+                        }
+                        stopAnalysisDetailVoService.insertSelective(node);
+                        //	node.setOpen(true);
+                        nodes.add(node);
+                    }
+
+                }
+            }
+        }
+
+        return vos;
+    }
+
+
+
+
+    /**
+     * 获取部件结构树
+     *
+     * @return
+     */
+    public List<StopAnalysisNodeVo> findLocationTreeByWtId(String wtId) throws Exception {
+
+        List<StopAnalysisNodeVo> vos = new ArrayList<>();
+        if (StringUtils.notEmp(wtId)) {
+
+            List<StopAnalysisDetailVo> list=stopAnalysisDetailVoService.findStopAnalysisDetailVoList(wtId);
+            if(!list.isEmpty())
+            {
+                List<StopAnalysisNodeVo> nodes = new ArrayList<StopAnalysisNodeVo>();
+                for(StopAnalysisDetailVo eq:list)
+                {
+                    StopAnalysisNodeVo node=new StopAnalysisNodeVo();
+                    node.setId(eq.getId());
+                    node.setPid(eq.getPid());
+                    node.setName(eq.getName());
+                    node.setJudegVulue(eq.getJudegvulue());
+                    //	node.setOpen(true);
+                    nodes.add(node);
+                }
+
+                StopAnalysisTreeUtil treeUtil=new StopAnalysisTreeUtil(nodes);
+                vos=treeUtil.buildJSONTree();
+            }
+
+        }
+
+        return vos;
+    }
+
+    public void saveAnalysisList(String wpId, String modelId, String typeId)
+    {
+        StopAnalysis stopAnalysis=new StopAnalysis();
+       //添加雪花主键id
+        String id=SnowflakeIdWorker.getUUID();
+
+        List<StopAnalysismainVo> mainlist=stopAnalysismainVoService.findStopAnalysismainVoList();
+        List<StopAnalysisDetailVo> detaillist=stopAnalysisDetailVoService.findStopAnalysisDetailVoList();
+
+
+        if(!mainlist.isEmpty() && !detaillist.isEmpty())
+        {
+            stopAnalysis.setId(id);
+            stopAnalysis.setWpid(wpId);
+            stopAnalysis.setRuleid(modelId);
+            stopAnalysis.setTimetype(typeId);
+            stopAnalysis.setJudegdate(new Date());
+            stopAnalysisService.insertSelective(stopAnalysis);
+
+            stopAnalysismainService.saveStopAnalysismainList(id,mainlist);
+            stopAnalysisDetailService.saveStopAnalysisDetailList(id,detaillist);
+        }
+
+    }
+    
+}

src/main/java/com/gyee/frame/service/stopanalysis/StopAnalysisTreeUtil.java

@@ -0,0 +1,173 @@
+package com.gyee.frame.service.stopanalysis;
+
+import com.gyee.frame.model.custom.StopAnalysisNodeVo;
+import com.gyee.frame.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class StopAnalysisTreeUtil {
+
+	
+//	private final String ROOT="../pages/warningalert/css/zTreeStyle/img/fj.png";
+//	private final String PARENT="../pages/warningalert/css/zTreeStyle/img/fu.png";
+//	private final String LEAF="../pages/warningalert/css/zTreeStyle/img/zi.png";
+	List<StopAnalysisNodeVo> nodes = new ArrayList<StopAnalysisNodeVo>();
+
+	public StopAnalysisTreeUtil(List<StopAnalysisNodeVo> nodes) {
+
+		super();
+
+		this.nodes = nodes;
+
+	}
+
+	/**
+	 * 构建JSON树形结构
+	 * 
+	 * @return
+	 */
+
+	public List<StopAnalysisNodeVo> buildJSONTree() {
+
+		List<StopAnalysisNodeVo> nodeTree = buildTree();
+		
+		//nodeTree.get(0).setIcon(ROOT);
+
+		//String json = JSON.toJSONString(nodeTree);
+
+		return nodeTree;
+
+	}
+
+	/**
+	 * 构建树形结构
+	 * 
+	 * @return
+	 */
+
+	public List<StopAnalysisNodeVo> buildTree() {
+
+		List<StopAnalysisNodeVo> treeNodes = new ArrayList<StopAnalysisNodeVo>();
+
+		List<StopAnalysisNodeVo> rootNodes = getRootNodes();
+
+		for (StopAnalysisNodeVo rootNode : rootNodes) {
+
+			buildChildNodes(rootNode);
+
+			treeNodes.add(rootNode);
+
+		}
+
+		return treeNodes;
+
+	}
+
+	/**
+	 * 递归子节点
+	 * 
+	 * @param node
+	 */
+
+	public void buildChildNodes(StopAnalysisNodeVo node) {
+
+		List<StopAnalysisNodeVo> children = getChildNodes(node);
+
+		if (!children.isEmpty()) {
+			//node.setIcon(PARENT);
+			
+			for (StopAnalysisNodeVo child : children) {
+
+				buildChildNodes(child);
+
+			}
+			node.setIsParent(true);
+			node.setChildren(children);
+
+		}else
+		{
+			//node.setIcon(LEAF);
+		}
+
+	}
+
+	/**
+	 * 获取父节点下所有的子节点
+	 *
+	 * @param pnode
+	 * @return
+	 */
+
+	public List<StopAnalysisNodeVo> getChildNodes(StopAnalysisNodeVo pnode) {
+
+		
+		List<StopAnalysisNodeVo> childNodes = new ArrayList<StopAnalysisNodeVo>();
+
+		for (StopAnalysisNodeVo n : nodes) {
+
+			if (pnode.getId().equals(n.getPid())) {
+
+				childNodes.add(n);
+				
+			}
+
+		}
+
+		return childNodes;
+
+	}
+
+	/**
+	 * 判断是否为根节点
+	 * 
+	 * @return
+	 */
+
+	public boolean rootNode(StopAnalysisNodeVo node) {
+
+		boolean isRootNode = true;
+
+		for (StopAnalysisNodeVo n : nodes) {
+
+			if (StringUtils.notEmp(node.getPid()) && node.getPid().equals(n.getId())) {
+
+				isRootNode = false;
+
+				break;
+
+			}
+
+		}
+
+		return isRootNode;
+
+	}
+
+	/**
+	 * 获取集合中所有的根节点
+	 * 
+	 * @return
+	 */
+
+	public List<StopAnalysisNodeVo> getRootNodes() {
+
+		List<StopAnalysisNodeVo> rootNodes = new ArrayList<StopAnalysisNodeVo>();
+
+		for (StopAnalysisNodeVo n : nodes) {
+
+			if (rootNode(n)) {
+
+				rootNodes.add(n);
+				
+			}
+
+		}
+
+		return rootNodes;
+
+	}
+
+
+}

src/main/java/com/gyee/frame/service/websocket/GeneralAppearancePushService.java

@@ -1,13 +1,14 @@
 package com.gyee.frame.service.websocket;
 
 
+import com.gyee.SpringbootStart;
 import com.gyee.frame.model.custom.PointData;
 import com.gyee.frame.util.IRealTimeDataBaseUtil;
 import com.gyee.frame.util.RealTimeDataBaseFactory;
 import com.gyee.frame.util.StringUtils;
 import org.apache.poi.ss.usermodel.*;
+import org.springframework.boot.system.ApplicationHome;
 import org.springframework.stereotype.Service;
-import org.springframework.util.ClassUtils;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -65,8 +66,10 @@ public class GeneralAppearancePushService {
     private Workbook openExcelByFile(String wpId) throws FileNotFoundException {
         Workbook wb = null;
         //String path = ClassUtils.getDefaultClassLoader().getResource("").getPath();
-        String staticPath = ClassUtils.getDefaultClassLoader().getResource("static").getPath();
-
+//        String staticPath = ClassUtils.getDefaultClassLoader().getResource("static").getPath();
+        ApplicationHome ah = new ApplicationHome(SpringbootStart.class);
+        String staticPath = ah.getSource().getParentFile().toString();
+//        System.out.println(staticPath);
         StringBuilder sb = new StringBuilder();
         switch (wpId) {
             case "MHS_FDC":
@@ -103,11 +106,12 @@ public class GeneralAppearancePushService {
             default:
 
         }
+ //       System.out.println(String.valueOf(sb));
         File file = new File(String.valueOf(sb));
-
+  //      System.out.println(file);
         try {
             wb = WorkbookFactory.create(file);
-
+     //       System.out.println(wb);
         } catch (Exception ex) {
             // do something
         }
@@ -136,7 +140,7 @@ public class GeneralAppearancePushService {
                 if (StringUtils.notEmp(cell0) && StringUtils.notEmp(cell1)) {
                     String pointName = cell0.getStringCellValue(); //点名
                     String pointValue = cell1.getStringCellValue(); //点值
-                    //System.out.println(pointName + "*********" + pointValue);
+                   // System.out.println(pointName + "*********" + pointValue);
                     namels.add(pointName);
                     valuels.add(pointValue);
                 }
@@ -154,7 +158,7 @@ public class GeneralAppearancePushService {
                     }
 
                 }
-
+              //  System.out.println("结果不为空");
             }
 
         }

src/main/java/com/gyee/frame/service/websocket/GenreSetPushService.java

@@ -10,6 +10,7 @@ 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.*;
+import com.gyee.frame.service.weather.WeatherDay5Service;
 import com.gyee.frame.service.weather.WeatherService;
 import com.gyee.frame.util.*;
 import org.springframework.stereotype.Service;
@@ -40,6 +41,10 @@ public class GenreSetPushService {
     private WindTurbineTestingPointAiService windTurbineTestingPointAiService;
     @Resource
     private WeatherService weatherService;
+    @Resource
+    private WeatherDay5Service weatherDay5Service;
+    @Resource
+    private PowerToPowerService powerToPowerService;
 
     private final String QS = "0";
     private final String FD = "-1";
@@ -415,6 +420,37 @@ public class GenreSetPushService {
             //预测发电量
             double rycfdl = rfdl * YCFDLXS;
             double yycfdl = yfdl * YCFDLXS;
+
+            Map<String,Object> weathermap= weatherDay5Service.getWeatherRealDay5Info(id);
+
+            if(!weathermap.isEmpty() && weathermap.containsKey("ls"))
+            {
+                java.util.List<Map<String,Object>> weatherls=(java.util.List<Map<String,Object>>)weathermap.get("ls");
+                if(!weatherls.isEmpty() && weatherls.size()>8 )
+                {
+                    Map<Double, Integer> speedmap = new HashMap<Double, Integer>();
+                    for (int i=0;i<8;i++) {
+
+                        Map<String,Object> wh=weatherls.get(i);
+
+                        double fs=(double)wh.get("fs");
+
+                        if (speedmap.containsKey(fs)) {
+                            int temp = speedmap.get(fs) + 4;
+                            speedmap.put(fs, temp);
+                        } else {
+                            speedmap.put(fs, 4);
+                        }
+
+                    }
+                    rycfdl = powerToPowerService.getPowerByWp(speedmap, id, 1);
+                }
+            }
+
+            if(rycfdl==0.0)
+            {
+                rycfdl = rfdl * YCFDLXS;
+            }
             jczbmap.put("rycfdl", MathUtil.twoBit(rycfdl));
             jczbmap.put("yycfdl", MathUtil.twoBit(yycfdl));
 
@@ -484,7 +520,7 @@ public class GenreSetPushService {
                     List<String> fjzbls = new ArrayList<>();
                         for (Windturbine wt : wtls) {
                             //状态
-                            fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getId());
+                            fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.ZTMX).getId());
 
                     }
 
@@ -1029,7 +1065,7 @@ public class GenreSetPushService {
         WindPowerStationTestingPoint2 rfdlai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_RFDL);
         WindPowerStationTestingPoint2 swdlai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SWDL);
         WindPowerStationTestingPoint2 gwdlai = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_GWDL);
-        WindPowerStationTestingPoint2 ssfs = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_PJFS);
+        WindPowerStationTestingPoint2 ssfs = windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         List<PointData> rfdls = realApiUtil.getHistoryDatasSnap(rfdlai, beginDate.getTime() / 1000, endDate.getTime() / 1000, num, 86400L);

src/main/java/com/gyee/frame/service/websocket/MatrixDetialGfPushService.java

@@ -218,9 +218,9 @@ public class MatrixDetialGfPushService {
                         case 5:
                             xdts++;
                             break;
-//                        case 6:
-//                            slts++;
-//                            break;
+                        case 6:
+                            xdts++;
+                            break;
 
                         default:
 

src/main/java/com/gyee/frame/service/websocket/MatrixPushByWpService.java

@@ -337,8 +337,8 @@ public class MatrixPushByWpService {
 
         Map<String, Object> map = new HashMap<String, Object>();
 
-        if(InitialRunner.wpmap.containsKey(wpId))
-        {
+//        if(InitialRunner.wpmap.containsKey(wpId))
+//        {
 
             Map<String, Object> wpmap = new HashMap<String, Object>();
 
@@ -373,19 +373,19 @@ public class MatrixPushByWpService {
 
 
                 List<String> jczbls = new ArrayList<>();
-//                //实时风速
-//                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS).getCode());
-//                //预测功率
-//                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, ycPoints1[0]).getCode());
-//                //保证功率
-//                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.ZBZGL).getCode());
-//                //应发功率
-//                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_ZZSGL).getCode());
-//                //实际功率
-//                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL).getCode());
-//                //AGC出线有功
-//                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.AGC001).getCode());
-//                //AGC有功设定
+                //实时风速
+                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS).getCode());
+                //预测功率
+                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, ycPoints1[0]).getCode());
+                //保证功率
+                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.ZBZGL).getCode());
+                //应发功率
+                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_ZZSGL).getCode());
+                //实际功率
+                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL).getCode());
+                //AGC出线有功
+                jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.AGC001).getCode());
+                //AGC有功设定
                 jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.AGC002).getCode());
                 //待机台数
                 jczbls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WT_DJTS).getCode());
@@ -405,60 +405,60 @@ public class MatrixPushByWpService {
 
                 if (!jczblist.isEmpty() && jczblist.size() == jczbls.size()) {
 
-//                    //实时风速
-//                    jczbmap.put("ssfs", MathUtil.twoBit(jczblist.get(0).getPointValueInDouble()));
-//                    //预测功率
-//                    jczbmap.put("ycgl", MathUtil.twoBit(jczblist.get(1).getPointValueInDouble()));
-//                    //保证功率
-//                    double bzgl = new BigDecimal(jczblist.get(2).getPointValueInDouble()).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue();
-//                    jczbmap.put("bzgl", bzgl);
-//                    //应发功率
-//                    double yfgl = new BigDecimal(jczblist.get(3).getPointValueInDouble()).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue();
-//                    jczbmap.put("yfgl", yfgl);
-//                    //实际功率
-//                    jczbmap.put("sjgl", MathUtil.twoBit(jczblist.get(4).getPointValueInDouble()));
-//                    //AGC出线有功
-//                    jczbmap.put("agccxyg", MathUtil.twoBit(jczblist.get(5).getPointValueInDouble()));
-//                    //AGC有功设定
-//                    jczbmap.put("agcygsd", MathUtil.twoBit(jczblist.get(6).getPointValueInDouble()));
-
-
-                    Double djts = MathUtil.twoBit(jczblist.get(0).getPointValueInDouble());
+                    //实时风速
+                    jczbmap.put("ssfs", MathUtil.twoBit(jczblist.get(0).getPointValueInDouble()));
+                    //预测功率
+                    jczbmap.put("ycgl", MathUtil.twoBit(jczblist.get(1).getPointValueInDouble()));
+                    //保证功率
+                    double bzgl = new BigDecimal(jczblist.get(2).getPointValueInDouble()).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    jczbmap.put("bzgl", bzgl);
+                    //应发功率
+                    double yfgl = new BigDecimal(jczblist.get(3).getPointValueInDouble()).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    jczbmap.put("yfgl", yfgl);
+                    //实际功率
+                    jczbmap.put("sjgl", MathUtil.twoBit(jczblist.get(4).getPointValueInDouble()));
+                    //AGC出线有功
+                    jczbmap.put("agccxyg", MathUtil.twoBit(jczblist.get(5).getPointValueInDouble()));
+                    //AGC有功设定
+                    jczbmap.put("agcygsd", MathUtil.twoBit(jczblist.get(6).getPointValueInDouble()));
+
+
+                    Double djts = MathUtil.twoBit(jczblist.get(7).getPointValueInDouble());
                     //待机台数
                     jczbmap.put("djts", djts);
                     //运行台数
-                    Double yxts = MathUtil.twoBit(jczblist.get(1).getPointValueInDouble());
+                    Double yxts = MathUtil.twoBit(jczblist.get(8).getPointValueInDouble());
                     jczbmap.put("yxts", yxts);
                     //故障台数
-                    Double gzts = MathUtil.twoBit(jczblist.get(2).getPointValueInDouble());
+                    Double gzts = MathUtil.twoBit(jczblist.get(9).getPointValueInDouble());
                     jczbmap.put("gzts", gzts);
                     //离线台数
-                    Double lxts = MathUtil.twoBit(jczblist.get(3).getPointValueInDouble());
+                    Double lxts = MathUtil.twoBit(jczblist.get(10).getPointValueInDouble());
                     jczbmap.put("lxts", lxts);
                     //维护台数
-                    Double whts = MathUtil.twoBit(jczblist.get(4).getPointValueInDouble());
+                    Double whts = MathUtil.twoBit(jczblist.get(11).getPointValueInDouble());
                     jczbmap.put("whts", whts);
                     //限电台数
-                    Double xdts = MathUtil.twoBit(jczblist.get(5).getPointValueInDouble());
+                    Double xdts = MathUtil.twoBit(jczblist.get(12).getPointValueInDouble());
                     jczbmap.put("xdts", xdts);
 
-                    jczbmap.put("jrts", djts+yxts+gzts+lxts+whts+xdts);
+
 
                 } else {
-//                    //实时风速
-//                    jczbmap.put("ssfs", 0.0);
-//                    //预测功率
-//                    jczbmap.put("ssfs", 0.0);
-//                    //保证功率
-//                    jczbmap.put("bzgl", 0.0);
-//                    //应发功率
-//                    jczbmap.put("yfgl", 0.0);
-//                    //实际功率
-//                    jczbmap.put("sjgl", 0.0);
-//                    //AGC出线有功
-//                    jczbmap.put("agccxyg", 0.0);
-//                    //AGC有功设定
-//                    jczbmap.put("agcygsd", 0.0);
+                    //实时风速
+                    jczbmap.put("ssfs", 0.0);
+                    //预测功率
+                    jczbmap.put("ssfs", 0.0);
+                    //保证功率
+                    jczbmap.put("bzgl", 0.0);
+                    //应发功率
+                    jczbmap.put("yfgl", 0.0);
+                    //实际功率
+                    jczbmap.put("sjgl", 0.0);
+                    //AGC出线有功
+                    jczbmap.put("agccxyg", 0.0);
+                    //AGC有功设定
+                    jczbmap.put("agcygsd", 0.0);
                     //待机台数
                     jczbmap.put("djts", 0.0);
                     //运行台数
@@ -471,7 +471,7 @@ public class MatrixPushByWpService {
                     jczbmap.put("whts", 0.0);
                     //限电台数
                     jczbmap.put("xdts", 0.0);
-
+                    //接入台数
                     jczbmap.put("jrts", 0.0);
                 }
 
@@ -479,243 +479,243 @@ public class MatrixPushByWpService {
                 Map<String, Object> zmmap=generalAppearancePushService.findGeneralAppearance(wpId);
 
                 //风场指标MAP
-                fczbmap.put("zmmap", zmmap);
+                map.put("zmmap", zmmap);
                 fczbmap.put("jczbmap",jczbmap);
 /*************************************************风场指标统计*************************************************************/
 
-//
-///*************************************************五项损失**************************************************************/
-//
-//                Map<String, Double> wxssmap = new HashMap<>();
-//                List<String> wxssls = new ArrayList<>();
-//
-//                // 日场内受累检修
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RLZSSDL).getCode());
-//                // 日场内受累故障
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RSZSSDL).getCode());
-//                // 月场内受累检修
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YLZSSDL).getCode());
-//                // 月场内受累故障
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YSZSSDL).getCode());
-//                // 年场内受累检修
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NLZSSDL).getCode());
-//                // 年场内受累故障
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NSZSSDL).getCode());
-//
-//                //日待机损失
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RSDJZSDL).getCode());
-//                //日手动停机损失
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RSSTZSDL).getCode());
-//                //日性能损失
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RXNZSDL).getCode());
-//                //日缺陷降出力损失
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RSQXZSDL).getCode());
-//                //日故障损失
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RGZSSDL).getCode());
-//                //日检修损失
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RJXSSDL).getCode());
-//
-//                //月待机损失
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YSDJZSDL).getCode());
-//                //月手动停机损失
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YSSTZSDL).getCode());
-//                //月性能损失
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YXNZSDL).getCode());
-//                //月缺陷降出力损失
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YSQXZSDL).getCode());
-//                //月故障损失
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YGZSSDL).getCode());
-//                //月检修损失
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YJXSSDL).getCode());
-//
-//
-//                //年待机损失
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NSDJZSDL).getCode());
-//                //年手动停机损失
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NSSTZSDL).getCode());
-//                //年性能损失
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NXNZSDL).getCode());
-//                //年缺陷降出力损失
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NSQXZSDL).getCode());
-//                //年故障损失
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NGZSSDL).getCode());
-//                //年检修损失
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NJXSSDL).getCode());
-//
-//
-//                //日限电损失
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RXDSSDL).getCode());
-//                //月限电损失
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YXDSSDL).getCode());
-//                //年限电损失
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NXDSSDL).getCode());
-//
-//
-//                //日场外受累电网
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RWZSSDL).getCode());
-//                // 日场外受累天气
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RTZSSDL).getCode());
-//                // 月场外受累电网
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YWZSSDL).getCode());
-//                // 月场外受累天气
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YTZSSDL).getCode());
-//                // 年场外受累电网
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NWZSSDL).getCode());
-//                // 年场外受累天气
-//                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NTZSSDL).getCode());
-//
-//
-//                List<PointData> wxsslist = realApiUtil.getRealData(wxssls);
-//
-//                if (!wxsslist.isEmpty() && wxsslist.size() == wxssls.size()) {
-//
-//                    Double rjxsl = MathUtil.twoBit(wxsslist.get(0).getPointValueInDouble());
-//                    // 日场内受累故障
-//                    Double rgzzsl = MathUtil.twoBit(wxsslist.get(1).getPointValueInDouble());
-//                    // 月场内受累检修
-//                    Double yjxsl = MathUtil.twoBit(wxsslist.get(2).getPointValueInDouble());
-//                    // 月场内受累故障
-//                    Double ygzzsl = MathUtil.twoBit(wxsslist.get(3).getPointValueInDouble());
-//                    // 年场内受累检修
-//                    Double njxsl = MathUtil.twoBit(wxsslist.get(4).getPointValueInDouble());
-//                    // 年场内受累故障
-//                    Double ngzzsl = MathUtil.twoBit(wxsslist.get(5).getPointValueInDouble());
-//
+
+/*************************************************五项损失**************************************************************/
+
+                Map<String, Double> wxssmap = new HashMap<>();
+                List<String> wxssls = new ArrayList<>();
+
+                // 日场内受累检修
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RLZSSDL).getCode());
+                // 日场内受累故障
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RSZSSDL).getCode());
+                // 月场内受累检修
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YLZSSDL).getCode());
+                // 月场内受累故障
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YSZSSDL).getCode());
+                // 年场内受累检修
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NLZSSDL).getCode());
+                // 年场内受累故障
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NSZSSDL).getCode());
+
+                //日待机损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RSDJZSDL).getCode());
+                //日手动停机损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RSSTZSDL).getCode());
+                //日性能损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RXNZSDL).getCode());
+                //日缺陷降出力损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RSQXZSDL).getCode());
+                //日故障损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RGZSSDL).getCode());
+                //日检修损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RJXSSDL).getCode());
+
+                //月待机损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YSDJZSDL).getCode());
+                //月手动停机损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YSSTZSDL).getCode());
+                //月性能损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YXNZSDL).getCode());
+                //月缺陷降出力损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YSQXZSDL).getCode());
+                //月故障损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YGZSSDL).getCode());
+                //月检修损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YJXSSDL).getCode());
+
+
+                //年待机损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NSDJZSDL).getCode());
+                //年手动停机损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NSSTZSDL).getCode());
+                //年性能损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NXNZSDL).getCode());
+                //年缺陷降出力损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NSQXZSDL).getCode());
+                //年故障损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NGZSSDL).getCode());
+                //年检修损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NJXSSDL).getCode());
+
+
+                //日限电损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RXDSSDL).getCode());
+                //月限电损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YXDSSDL).getCode());
+                //年限电损失
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NXDSSDL).getCode());
+
+
+                //日场外受累电网
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RWZSSDL).getCode());
+                // 日场外受累天气
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.RTZSSDL).getCode());
+                // 月场外受累电网
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YWZSSDL).getCode());
+                // 月场外受累天气
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.YTZSSDL).getCode());
+                // 年场外受累电网
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NWZSSDL).getCode());
+                // 年场外受累天气
+                wxssls.add(windPowerstationTestingPointService.getWindPowerStationTestingPoint2(wpId, Constant.NTZSSDL).getCode());
+
+
+                List<PointData> wxsslist = realApiUtil.getRealData(wxssls);
+
+                if (!wxsslist.isEmpty() && wxsslist.size() == wxssls.size()) {
+
+                    Double rjxsl = MathUtil.twoBit(wxsslist.get(0).getPointValueInDouble());
+                    // 日场内受累故障
+                    Double rgzzsl = MathUtil.twoBit(wxsslist.get(1).getPointValueInDouble());
+                    // 月场内受累检修
+                    Double yjxsl = MathUtil.twoBit(wxsslist.get(2).getPointValueInDouble());
+                    // 月场内受累故障
+                    Double ygzzsl = MathUtil.twoBit(wxsslist.get(3).getPointValueInDouble());
+                    // 年场内受累检修
+                    Double njxsl = MathUtil.twoBit(wxsslist.get(4).getPointValueInDouble());
+                    // 年场内受累故障
+                    Double ngzzsl = MathUtil.twoBit(wxsslist.get(5).getPointValueInDouble());
+
 //                    wxssmap.put("rjxsl", rjxsl);
 //                    wxssmap.put("rgzzsl", rgzzsl);
 //                    wxssmap.put("yjxsl", yjxsl);
 //                    wxssmap.put("ygzzsl", ygzzsl);
 //                    wxssmap.put("njxsl", njxsl);
 //                    wxssmap.put("ngzzsl", ngzzsl);
-//
-//                    //日待机损失
-//                    Double rdjss = MathUtil.twoBit(wxsslist.get(6).getPointValueInDouble());
-//                    //日手动停机损失
-//                    Double rsdtjss = MathUtil.twoBit(wxsslist.get(7).getPointValueInDouble());
-//                    //日性能损失
-//                    Double rxnss = MathUtil.twoBit(wxsslist.get(8).getPointValueInDouble());
-//                    //日缺陷降出力损失
-//                    Double rqxjclss = MathUtil.twoBit(wxsslist.get(9).getPointValueInDouble());
-//
-//                    //日欠发损失=日待机损失+日手动停机损失+日性能损失+日缺陷降出力损失
-//                    Double rqfssdl = new BigDecimal(rdjss + rsdtjss + rxnss + rqxjclss).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
-//
-//                    Double rgzss = MathUtil.twoBit(wxsslist.get(10).getPointValueInDouble());
-//                    //日故障损失电量=日故障损失+日故障受累
-//                    Double rgzssdl = new BigDecimal(rgzss + rgzzsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
-//                    //日检修损失电量=日检修损失+日检修受累
-//                    Double rjxss = MathUtil.twoBit(wxsslist.get(11).getPointValueInDouble());
-//                    Double rjxssdl = new BigDecimal(rjxss + rjxsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
-//
-//
-//                    wxssmap.put("rqfssdl", rqfssdl);
-//                    wxssmap.put("rgzssdl", rgzssdl);
-//                    wxssmap.put("rjxssdl", rjxssdl);
-//
-//                    // 月场内受累检修
-//                    Double ydjss = MathUtil.twoBit(wxsslist.get(12).getPointValueInDouble());
-//                    // 月场内受累检修
-//                    Double ysdtjss = MathUtil.twoBit(wxsslist.get(13).getPointValueInDouble());
-//                    // 月场内受累检修
-//                    Double yxnss = MathUtil.twoBit(wxsslist.get(14).getPointValueInDouble());
-//                    // 月场内受累检修
-//                    Double yqxjclss = MathUtil.twoBit(wxsslist.get(15).getPointValueInDouble());
-//                    //月欠发损失=月待机损失+月手动停机损失+月性能损失+月缺陷降出力损失
-//                    Double yqfssdl = new BigDecimal(ydjss + ysdtjss + yxnss + yqxjclss).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
-//
-//                    Double ygzss = MathUtil.twoBit(wxsslist.get(16).getPointValueInDouble());
-//                    //月故障损失电量=月故障损失+月故障受累
-//                    Double ygzssdl = new BigDecimal(ygzss + ygzzsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
-//                    Double yjxss = MathUtil.twoBit(wxsslist.get(17).getPointValueInDouble());
-//                    //月检修损失电量=月检修损失+月检修受累
-//                    Double yjxssdl = new BigDecimal(yjxss + yjxsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
-//
-//                    wxssmap.put("yqfssdl", yqfssdl);
-//                    wxssmap.put("ygzssdl", ygzssdl);
-//                    wxssmap.put("yjxssdl", yjxssdl);
-//
-//                    // 年场内受累检修
-//                    Double ndjss = MathUtil.twoBit(wxsslist.get(18).getPointValueInDouble());
-//                    // 年场内受累检修
-//                    Double nsdtjss = MathUtil.twoBit(wxsslist.get(19).getPointValueInDouble());
-//                    // 年场内受累检修
-//                    Double nxnss = MathUtil.twoBit(wxsslist.get(20).getPointValueInDouble());
-//                    // 年场内受累检修
-//                    Double nqxjclss = MathUtil.twoBit(wxsslist.get(21).getPointValueInDouble());
-//
-//                    Double nqfssdl = new BigDecimal(ndjss + nsdtjss + nxnss + nqxjclss).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
-//
-//                    Double ngzss = MathUtil.twoBit(wxsslist.get(22).getPointValueInDouble());
-//                    //年故障损失电量=年故障损失+年故障受累
-//                    Double ngzssdl = new BigDecimal(ngzss + ngzzsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
-//                    Double njxss = MathUtil.twoBit(wxsslist.get(23).getPointValueInDouble());
-//                    //年检修损失电量=年检修损失+年检修受累
-//                    Double njxssdl = new BigDecimal(njxss + njxsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
-//
-//                    wxssmap.put("nqfssdl", nqfssdl);
-//                    wxssmap.put("ngzssdl", ngzssdl);
-//                    wxssmap.put("njxssdl", njxssdl);
-//
-//                    double temp = 0.0;
-//                    temp = MathUtil.twoBit(wxsslist.get(24).getPointValueInDouble());
-//                    Double rxdssdl = new BigDecimal(temp).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
-//                    temp = MathUtil.twoBit(wxsslist.get(25).getPointValueInDouble());
-//                    Double yxdssdl = new BigDecimal(temp).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
-//                    temp = MathUtil.twoBit(wxsslist.get(26).getPointValueInDouble());
-//                    Double nxdssdl = new BigDecimal(temp).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
-//
-//                    wxssmap.put("rxdssdl", StringUtils.round(rxdssdl < 0.0 ? 0.0 : rxdssdl, 2));
-//                    wxssmap.put("yxdssdl", StringUtils.round(yxdssdl < 0.0 ? 0.0 : yxdssdl, 2));
-//                    wxssmap.put("nxdssdl", StringUtils.round(nxdssdl < 0.0 ? 0.0 : nxdssdl, 2));
-//
-//                    Double rdwsl = MathUtil.twoBit(wxsslist.get(27).getPointValueInDouble());
-//                    Double rtqsl = MathUtil.twoBit(wxsslist.get(28).getPointValueInDouble());
-//                    Double rslssdl = new BigDecimal(rdwsl + rtqsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
-//                    Double ydwsl = MathUtil.twoBit(wxsslist.get(29).getPointValueInDouble());
-//                    Double ytqsl = MathUtil.twoBit(wxsslist.get(30).getPointValueInDouble());
-//                    Double yslssdl = new BigDecimal(ydwsl + ytqsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
-//                    Double ndwsl = MathUtil.twoBit(wxsslist.get(31).getPointValueInDouble());
-//                    Double ntqsl = MathUtil.twoBit(wxsslist.get(32).getPointValueInDouble());
-//                    Double nslssdl = new BigDecimal(ndwsl + ntqsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
-//
-//                    wxssmap.put("rslssdl", rslssdl);
-//                    wxssmap.put("yslssdl", yslssdl);
-//                    wxssmap.put("nslssdl", nslssdl);
-//
-//                } else {
-//
-//                    wxssmap.put("rjxsl", 0.0);
-//                    wxssmap.put("rgzzsl", 0.0);
-//                    wxssmap.put("yjxsl", 0.0);
-//                    wxssmap.put("ygzzsl", 0.0);
-//                    wxssmap.put("njxsl", 0.0);
-//                    wxssmap.put("ngzzsl", 0.0);
-//                    wxssmap.put("rqfssdl", 0.0);
-//                    wxssmap.put("rgzssdl", 0.0);
-//                    wxssmap.put("rjxssdl", 0.0);
-//
-//                    wxssmap.put("yqfssdl", 0.0);
-//                    wxssmap.put("ygzssdl", 0.0);
-//                    wxssmap.put("yjxssdl", 0.0);
-//
-//                    wxssmap.put("nqfssdl", 0.0);
-//                    wxssmap.put("ngzssdl", 0.0);
-//                    wxssmap.put("njxssdl", 0.0);
-//
-//
-//                    wxssmap.put("rxdssdl", 0.0);
-//                    wxssmap.put("yxdssdl", 0.0);
-//                    wxssmap.put("nxdssdl", 0.0);
-//
-//
-//                    wxssmap.put("rslssdl", 0.0);
-//                    wxssmap.put("yslssdl", 0.0);
-//                    wxssmap.put("nslssdl", 0.0);
-//
-//                }
-//                map.put("wxssmap", wxssmap);
-///*************************************************五项损失**************************************************************/
-//
+
+                    //日待机损失
+                    Double rdjss = MathUtil.twoBit(wxsslist.get(6).getPointValueInDouble());
+                    //日手动停机损失
+                    Double rsdtjss = MathUtil.twoBit(wxsslist.get(7).getPointValueInDouble());
+                    //日性能损失
+                    Double rxnss = MathUtil.twoBit(wxsslist.get(8).getPointValueInDouble());
+                    //日缺陷降出力损失
+                    Double rqxjclss = MathUtil.twoBit(wxsslist.get(9).getPointValueInDouble());
+
+                    //日欠发损失=日待机损失+日手动停机损失+日性能损失+日缺陷降出力损失
+                    Double rqfssdl = new BigDecimal(rdjss + rsdtjss + rxnss + rqxjclss).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+                    Double rgzss = MathUtil.twoBit(wxsslist.get(10).getPointValueInDouble());
+                    //日故障损失电量=日故障损失+日故障受累
+                    Double rgzssdl = new BigDecimal(rgzss + rgzzsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    //日检修损失电量=日检修损失+日检修受累
+                    Double rjxss = MathUtil.twoBit(wxsslist.get(11).getPointValueInDouble());
+                    Double rjxssdl = new BigDecimal(rjxss + rjxsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+
+                    wxssmap.put("rqfssdl", rqfssdl);
+                    wxssmap.put("rgzssdl", rgzssdl);
+                    wxssmap.put("rjxssdl", rjxssdl);
+
+                    // 月场内受累检修
+                    Double ydjss = MathUtil.twoBit(wxsslist.get(12).getPointValueInDouble());
+                    // 月场内受累检修
+                    Double ysdtjss = MathUtil.twoBit(wxsslist.get(13).getPointValueInDouble());
+                    // 月场内受累检修
+                    Double yxnss = MathUtil.twoBit(wxsslist.get(14).getPointValueInDouble());
+                    // 月场内受累检修
+                    Double yqxjclss = MathUtil.twoBit(wxsslist.get(15).getPointValueInDouble());
+                    //月欠发损失=月待机损失+月手动停机损失+月性能损失+月缺陷降出力损失
+                    Double yqfssdl = new BigDecimal(ydjss + ysdtjss + yxnss + yqxjclss).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+                    Double ygzss = MathUtil.twoBit(wxsslist.get(16).getPointValueInDouble());
+                    //月故障损失电量=月故障损失+月故障受累
+                    Double ygzssdl = new BigDecimal(ygzss + ygzzsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    Double yjxss = MathUtil.twoBit(wxsslist.get(17).getPointValueInDouble());
+                    //月检修损失电量=月检修损失+月检修受累
+                    Double yjxssdl = new BigDecimal(yjxss + yjxsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+                    wxssmap.put("yqfssdl", yqfssdl);
+                    wxssmap.put("ygzssdl", ygzssdl);
+                    wxssmap.put("yjxssdl", yjxssdl);
+
+                    // 年场内受累检修
+                    Double ndjss = MathUtil.twoBit(wxsslist.get(18).getPointValueInDouble());
+                    // 年场内受累检修
+                    Double nsdtjss = MathUtil.twoBit(wxsslist.get(19).getPointValueInDouble());
+                    // 年场内受累检修
+                    Double nxnss = MathUtil.twoBit(wxsslist.get(20).getPointValueInDouble());
+                    // 年场内受累检修
+                    Double nqxjclss = MathUtil.twoBit(wxsslist.get(21).getPointValueInDouble());
+
+                    Double nqfssdl = new BigDecimal(ndjss + nsdtjss + nxnss + nqxjclss).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+                    Double ngzss = MathUtil.twoBit(wxsslist.get(22).getPointValueInDouble());
+                    //年故障损失电量=年故障损失+年故障受累
+                    Double ngzssdl = new BigDecimal(ngzss + ngzzsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    Double njxss = MathUtil.twoBit(wxsslist.get(23).getPointValueInDouble());
+                    //年检修损失电量=年检修损失+年检修受累
+                    Double njxssdl = new BigDecimal(njxss + njxsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+                    wxssmap.put("nqfssdl", nqfssdl);
+                    wxssmap.put("ngzssdl", ngzssdl);
+                    wxssmap.put("njxssdl", njxssdl);
+
+                    double temp = 0.0;
+                    temp = MathUtil.twoBit(wxsslist.get(24).getPointValueInDouble());
+                    Double rxdssdl = new BigDecimal(temp).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    temp = MathUtil.twoBit(wxsslist.get(25).getPointValueInDouble());
+                    Double yxdssdl = new BigDecimal(temp).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    temp = MathUtil.twoBit(wxsslist.get(26).getPointValueInDouble());
+                    Double nxdssdl = new BigDecimal(temp).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+                    wxssmap.put("rxdssdl", StringUtils.round(rxdssdl < 0.0 ? 0.0 : rxdssdl, 2));
+                    wxssmap.put("yxdssdl", StringUtils.round(yxdssdl < 0.0 ? 0.0 : yxdssdl, 2));
+                    wxssmap.put("nxdssdl", StringUtils.round(nxdssdl < 0.0 ? 0.0 : nxdssdl, 2));
+
+                    Double rdwsl = MathUtil.twoBit(wxsslist.get(27).getPointValueInDouble());
+                    Double rtqsl = MathUtil.twoBit(wxsslist.get(28).getPointValueInDouble());
+                    Double rslssdl = new BigDecimal(rdwsl + rtqsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    Double ydwsl = MathUtil.twoBit(wxsslist.get(29).getPointValueInDouble());
+                    Double ytqsl = MathUtil.twoBit(wxsslist.get(30).getPointValueInDouble());
+                    Double yslssdl = new BigDecimal(ydwsl + ytqsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    Double ndwsl = MathUtil.twoBit(wxsslist.get(31).getPointValueInDouble());
+                    Double ntqsl = MathUtil.twoBit(wxsslist.get(32).getPointValueInDouble());
+                    Double nslssdl = new BigDecimal(ndwsl + ntqsl).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+                    wxssmap.put("rslssdl", rslssdl);
+                    wxssmap.put("yslssdl", yslssdl);
+                    wxssmap.put("nslssdl", nslssdl);
+
+                } else {
+
+                    wxssmap.put("rjxsl", 0.0);
+                    wxssmap.put("rgzzsl", 0.0);
+                    wxssmap.put("yjxsl", 0.0);
+                    wxssmap.put("ygzzsl", 0.0);
+                    wxssmap.put("njxsl", 0.0);
+                    wxssmap.put("ngzzsl", 0.0);
+                    wxssmap.put("rqfssdl", 0.0);
+                    wxssmap.put("rgzssdl", 0.0);
+                    wxssmap.put("rjxssdl", 0.0);
+
+                    wxssmap.put("yqfssdl", 0.0);
+                    wxssmap.put("ygzssdl", 0.0);
+                    wxssmap.put("yjxssdl", 0.0);
+
+                    wxssmap.put("nqfssdl", 0.0);
+                    wxssmap.put("ngzssdl", 0.0);
+                    wxssmap.put("njxssdl", 0.0);
+
+
+                    wxssmap.put("rxdssdl", 0.0);
+                    wxssmap.put("yxdssdl", 0.0);
+                    wxssmap.put("nxdssdl", 0.0);
+
+
+                    wxssmap.put("rslssdl", 0.0);
+                    wxssmap.put("yslssdl", 0.0);
+                    wxssmap.put("nslssdl", 0.0);
+
+                }
+                map.put("wxssmap", wxssmap);
+/*************************************************五项损失**************************************************************/
+
 
 /*************************************************风机指标统计*************************************************************/
                 List<String> fjzbls = new ArrayList<>();
@@ -743,6 +743,7 @@ public class MatrixPushByWpService {
 
 
                     int step=4;
+                    int slts=0;
                     for(int i=0;i<wtls.size();i++)
                     {
                         Windturbine wt=wtls.get(i);
@@ -765,6 +766,9 @@ public class MatrixPushByWpService {
 //                        vo.setGl(gl);
 //                        vo.setFdjzs(MathUtil.twoBit(fjzblist.get(i*step+3).getPointValueInDouble()));
                         vo.setWtCode(wt.getCode());
+                        if (fjzt == 6) {
+                            slts++;
+                        }
 //
 //                        if (fjzt == 3) {
 //                            vo.setLyl(0.0);
@@ -784,6 +788,15 @@ public class MatrixPushByWpService {
 
                     }
 
+                    jczbmap.put("slts", slts);
+                    if(jczbmap.containsKey("jrts"))
+                    {
+                        Double jrts=(Double)jczbmap.get("jrts");
+                        jrts=jrts+slts;
+                        jczbmap.put("jrts",jrts);
+                    }
+
+
                 }
                 //fjmap.put(wpId,vomap);
                 fjvos.add(vos);
@@ -821,7 +834,7 @@ public class MatrixPushByWpService {
 
 
 
-        }
+//        }
 
 
 

src/main/java/com/gyee/frame/service/websocket/MatrixPushService.java

@@ -243,9 +243,9 @@ public class MatrixPushService {
 
 
                     double fjzt = MathUtil.twoBit(fjzblist.get(i * step).getPointValueInDouble());
-//                    if (fjzt == 6) {
-//                        slts++;
-//                    }
+                    if (fjzt == 6) {
+                        slts++;
+                    }
                     vo.setFjzt(fjzt);
                     vo.setFs(MathUtil.twoBit(fjzblist.get(i * step + 1).getPointValueInDouble()));
                     vo.setGl(MathUtil.twoBit(fjzblist.get(i * step + 2).getPointValueInDouble()));
@@ -256,7 +256,7 @@ public class MatrixPushService {
                 }
 
 
-                jczbmap.put("slts", Double.valueOf(slts));
+                jczbmap.put("slts", 0.0);
 
                 double djts=(Double)jczbmap.get("djts");
                 double yxts=(Double)jczbmap.get("yxts");

src/main/java/com/gyee/frame/service/websocket/MatrixQfPushService.java

@@ -252,10 +252,10 @@ public class MatrixQfPushService {
                         }
                     }
 
-//                    if(fjzt==6)
-//                    {
-//                        slts++;
-//                    }
+                    if(fjzt==6)
+                    {
+                        slts++;
+                    }
                     if(StringUtils.notEmp(wt.getStatus()))
                     {
                         String num=wt.getStatus().substring(wt.getStatus().length()-3);
@@ -267,7 +267,7 @@ public class MatrixQfPushService {
                     vos.add(vo);
                 }
                 //限电台数
-                jczbmap.put("slts", slts);
+                jczbmap.put("slts", 0.0);
                 double djts=(Double)jczbmap.get("djts");
                 double yxts=(Double)jczbmap.get("yxts");
                 double gzts=(Double)jczbmap.get("gzts");

src/main/java/com/gyee/frame/service/websocket/WtInfoPushService.java

@@ -1,6 +1,7 @@
 package com.gyee.frame.service.websocket;
 
 
+import com.google.common.collect.Maps;
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.auto.*;
@@ -10,6 +11,11 @@ import com.gyee.frame.service.WindTurbineTestingPointAiService;
 import com.gyee.frame.service.WindTurbineTestingPointDiService;
 import com.gyee.frame.service.WindturbineinfodayService;
 import com.gyee.frame.util.*;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+
+import org.apache.commons.compress.utils.Lists;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -1135,6 +1141,168 @@ public class WtInfoPushService {
         return vos;
     }
 
-}
-
+	public List<Map<String, Object>> findInverterInfoList(String wpId) throws Exception {
+		List<Map<String, Object>> vos = new ArrayList<>();
+		if (StringUtils.notEmp(wpId) && InitialRunner.wp_wtmap.containsKey(wpId)) {
+			List<Windturbine> wtls = InitialRunner.wp_wtmap.get(wpId);
+			for (Windturbine wt : wtls) {
+				Map<String, Object> map = new HashMap<String, Object>();
+				map.put("model", wt.getModelid());
+				map.put("wpid", wt.getWindpowerstationid());
+				map.put("pjid", wt.getProjectid());
+				map.put("lnid", wt.getLineid());
+				map.put("code", wt.getCode());
+				map.put("wtId", wt.getId());
+				
+				Line ln = InitialRunner.lnmap.get(wt.getLineid());
+				map.put("lnname", ln.getName());
+				List<String> zbls = new ArrayList<>();
+				
+				String[] codeName[] = { 
+						{ "JSSSFS", "光照强度"}, 
+						{ "AI130", "有功功率"}, 
+						{ "AI067", "功率因数"}, 
+						{ "AIG071", "机内温度"}, 
+						{ "AIG072", "逆变效率" }, 
+						{ "AI130", "功率"},
+						{ "AIG104", "功率因数" }, 
+						{ "RFDL", "日发电量" }, 
+						{ "YFDL", "月发电量" }, 
+						{ "NFDL", "年发电量" }, 
+						{ "AIG064", "累计发电量" }
+				};
+				// 遍历定义码，获取测点Id集合
+				Map<String, String> pointUniformMap = Maps.newHashMap();
+				for (String[] str1 : codeName) {
+					String pointid = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), str1[0]).getId();
+					zbls.add(pointid);
+					pointUniformMap.put(pointid, str1[0]);
+				}
+				// 获取测点值，与定义码绑定
+				List<PointData> zblist = realApiUtil.getRealData(zbls);
+//				Map<String, Object> uniformValueMap = Maps.newHashMap();
+//				uniformValueMap.put("定义码对照", codeName);
+				for (PointData p : zblist) {
+					String ednaId = p.getEdnaId();
+					Double val = MathUtil.twoBit(p.getPointValueInDouble());
+					String uniformCode = pointUniformMap.get(ednaId);
+					map.put(uniformCode, val);
+				}
+				vos.add(map);
+			}
+		}
+		return vos;
+	}
+
+	public Object findInverterDI(String id) throws Exception {
+		List<WindTurbineTestingPointDi2> pointList = windTurbineTestingPointDiService.getWindTurbineTestingPointDi2List(id);
+		Map<String, String> idName = Maps.newHashMap();
+		List<String> pointids = Lists.newArrayList();
+		for (WindTurbineTestingPointDi2 point : pointList) {
+			idName.put(point.getId(), point.getName());
+			pointids.add(point.getId());
+		}
+		List<PointData> realData = realApiUtil.getRealData(pointids);
+		List<Object> onList = Lists.newArrayList();
+		List<Object> allList = Lists.newArrayList();
+		for (PointData p : realData) {
+			Map<String, Object> row = Maps.newHashMap();
+			row.put("id", p.getEdnaId());
+			row.put("name", idName.get(p.getEdnaId()));
+			row.put("value", p.getPointValueInDouble());
+			allList.add(row);
+			if (1 == p.getPointValueInDouble()) {
+				onList.add(row);
+			}
+		}
+		Map<String, Object> map = Maps.newHashMap();
+		map.put("allList", allList);
+		map.put("onList", onList);
+		return map;
+	}
+
+	public List<Object> findInverterPowerCurve(String id) throws Exception {
+		List<Object> list = Lists.newArrayList();
+		Date now = new Date();
+		Date date = DateUtil.beginOfDay(now);
+		String pointid = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, "AI130").getId();
+		while (date.before(now)) {
+			Date begin = DateUtils.addMinutes(date, -30);
+			List<PointData> histStat = realApiUtil.getHistStat(pointid, begin.getTime() / 1000, date.getTime() / 1000, 1L, 30L * 60, 0);
+			Double val = 0D;
+			if (histStat != null && !histStat.isEmpty() && histStat.get(0) != null) {
+				val = histStat.get(0).getPointValueInDouble();
+				val = MathUtil.twoBit(val);
+			}
+			list.add(val);
+			date = DateUtils.addMinutes(date, 30);
+		}
+		return list;
+	}
+
+	public List<Object> findInverterInfo(String id) throws Exception {
+		Map<String, Object> map = new HashMap<String, Object>();
+		if (StringUtils.notEmp(id)) {
+			if (InitialRunner.wtmap.containsKey(id)) {
+				Windturbine wt = InitialRunner.wtmap.get(id);
+				map.put("model", wt.getModelid());
+				map.put("wpid", wt.getWindpowerstationid());
+				map.put("pjid", wt.getProjectid());
+				map.put("lnid", wt.getLineid());
+				map.put("code", wt.getCode());
+				Line ln = InitialRunner.lnmap.get(wt.getLineid());
+				map.put("lnname", ln.getName());
+				List<String> zbls = new ArrayList<>();
+				String[] codeName[] = {
+						{"AIG061", "交流电压","V"},
+						{"AIG081", "直流电压","V"},
+						{"AIG060", "交流电流","A"},
+						{"AIG078", "直流电流","A"},
+						{"AIG073", "电网频率","Hz"},
+						{"AI130", "功率","W"},
+						{"AIG104", "功率因数",""},
+						{"RFDL", "日发电量","kwh"},//TODO 疑似 各厂发电量单位不統一
+						{"YFDL", "月发电量","kwh"},
+						{"NFDL", "年发电量","kwh"},
+						{"AIG064", "累计发电量","kwh"},
+						{"AIG071", "逆变器温度","℃"},
+						{"AIG072", "效率",""},
+						{"eyht", "累计二氧化碳减排量","kg"}
+				};
+				// 遍历定义码，获取测点Id集合
+				Map<String, String> pointUniformMap = Maps.newHashMap();
+				for (String[] str1 : codeName) {
+					String pointid = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, str1[0]).getId();
+					zbls.add(pointid);
+					pointUniformMap.put(pointid, str1[0]);
+				}
+				// 获取测点值，与定义码绑定
+				List<PointData> zblist = realApiUtil.getRealData(zbls);
+				Map<String, Object> uniformValueMap = Maps.newHashMap();
+				for (PointData p : zblist) {
+					String ednaId = p.getEdnaId();
+					Double val = MathUtil.twoBit(p.getPointValueInDouble());
+					String uniformCode = pointUniformMap.get(ednaId);
+					uniformValueMap.put(uniformCode, val);
+				}
+				// 遍历定义码，添加测点值、单位、名称
+				List<Object> list = Lists.newArrayList();
+				for (String[] str1 : codeName) {
+					list.add(buildResult(str1[0], str1[1], uniformValueMap.get(str1[0]), str1[2]));
+				}
+				return list;
+			}
+		}
+		return Lists.newArrayList();
+	}
+
+	private Map<String, Object> buildResult(String uniCode, String name, Object value, String unit) {
+		Map<String, Object> map = Maps.newHashMap();
+		map.put("uniCode", uniCode);
+		map.put("name", name);
+		map.put("value", value);
+		map.put("unit", unit);
+		return map;
+	}
 
+}

src/main/resources/mybatis-generator.xml

@@ -106,9 +106,12 @@
 <!--        <table tableName='Equipment' domainObjectName='EquipmentSql'/>-->
 
 
+<!--        <table tableName='StopAnalysis' domainObjectName='StopAnalysis'/>-->
+<!--        <table tableName='StopAnalysismain' domainObjectName='StopAnalysismain'/>-->
+<!--        <table tableName='StopAnalysismainVo' domainObjectName='StopAnalysismainVo'/>-->
+        <table tableName='StopAnalysisDetail' domainObjectName='StopAnalysisDetail'/>
+        <table tableName='StopAnalysisDetailVo' domainObjectName='StopAnalysisDetailVo'/>
 
 
-        <table tableName='Windturbineinfodaytop' domainObjectName='Windturbineinfodaytop'/>
-
     </context>
 </generatorConfiguration>

src/main/resources/mybatis/auto/EliminatingeqMapper.xml

@@ -0,0 +1,445 @@
+<?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.auto.EliminatingeqMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Eliminatingeq">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="NUMERIC" property="id" />
+    <result column="BADNAME" jdbcType="NVARCHAR" property="badname" />
+    <result column="MODELNUMBERS" jdbcType="NVARCHAR" property="modelnumbers" />
+    <result column="NUMBER" jdbcType="NUMERIC" property="number" />
+    <result column="BELONGS" jdbcType="NVARCHAR" property="belongs" />
+    <result column="DESCRIPTION" jdbcType="NVARCHAR" property="description" />
+    <result column="SITENUM" jdbcType="NVARCHAR" property="sitenum" />
+    <result column="CORPNUM" jdbcType="NVARCHAR" property="corpnum" />
+    <result column="BUGNUM" jdbcType="NVARCHAR" property="bugnum" />
+    <result column="RECORDPERSONNEL" jdbcType="NVARCHAR" property="recordpersonnel" />
+    <result column="MANUFACTURERS" jdbcType="NVARCHAR" property="manufacturers" />
+    <result column="EQNUM" jdbcType="NVARCHAR" property="eqnum" />
+    <result column="LOCATION" jdbcType="NVARCHAR" property="location" />
+    <result column="NEWEQNUM" jdbcType="NVARCHAR" property="neweqnum" />
+    <result column="REPLACETIME" jdbcType="TIMESTAMP" property="replacetime" />
+    <result column="SPARENAME" jdbcType="NVARCHAR" property="sparename" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    ID, BADNAME, MODELNUMBERS, NUMBER, BELONGS, DESCRIPTION, SITENUM, CORPNUM, BUGNUM, 
+    RECORDPERSONNEL, MANUFACTURERS, EQNUM, LOCATION, NEWEQNUM, REPLACETIME, SPARENAME
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.EliminatingeqExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from ELIMINATINGEQ
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from ELIMINATINGEQ
+    where ID = #{id,jdbcType=NUMERIC}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from ELIMINATINGEQ
+    where ID = #{id,jdbcType=NUMERIC}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.EliminatingeqExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from ELIMINATINGEQ
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Eliminatingeq">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into ELIMINATINGEQ (ID, BADNAME, MODELNUMBERS, 
+      NUMBER, BELONGS, DESCRIPTION, 
+      SITENUM, CORPNUM, BUGNUM, 
+      RECORDPERSONNEL, MANUFACTURERS, EQNUM, 
+      LOCATION, NEWEQNUM, REPLACETIME, 
+      SPARENAME)
+    values (#{id,jdbcType=NUMERIC}, #{badname,jdbcType=NVARCHAR}, #{modelnumbers,jdbcType=NVARCHAR}, 
+      #{number,jdbcType=NUMERIC}, #{belongs,jdbcType=NVARCHAR}, #{description,jdbcType=NVARCHAR}, 
+      #{sitenum,jdbcType=NVARCHAR}, #{corpnum,jdbcType=NVARCHAR}, #{bugnum,jdbcType=NVARCHAR}, 
+      #{recordpersonnel,jdbcType=NVARCHAR}, #{manufacturers,jdbcType=NVARCHAR}, #{eqnum,jdbcType=NVARCHAR}, 
+      #{location,jdbcType=NVARCHAR}, #{neweqnum,jdbcType=NVARCHAR}, #{replacetime,jdbcType=TIMESTAMP}, 
+      #{sparename,jdbcType=NVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Eliminatingeq">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into ELIMINATINGEQ
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="badname != null">
+        BADNAME,
+      </if>
+      <if test="modelnumbers != null">
+        MODELNUMBERS,
+      </if>
+      <if test="number != null">
+        NUMBER,
+      </if>
+      <if test="belongs != null">
+        BELONGS,
+      </if>
+      <if test="description != null">
+        DESCRIPTION,
+      </if>
+      <if test="sitenum != null">
+        SITENUM,
+      </if>
+      <if test="corpnum != null">
+        CORPNUM,
+      </if>
+      <if test="bugnum != null">
+        BUGNUM,
+      </if>
+      <if test="recordpersonnel != null">
+        RECORDPERSONNEL,
+      </if>
+      <if test="manufacturers != null">
+        MANUFACTURERS,
+      </if>
+      <if test="eqnum != null">
+        EQNUM,
+      </if>
+      <if test="location != null">
+        LOCATION,
+      </if>
+      <if test="neweqnum != null">
+        NEWEQNUM,
+      </if>
+      <if test="replacetime != null">
+        REPLACETIME,
+      </if>
+      <if test="sparename != null">
+        SPARENAME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=NUMERIC},
+      </if>
+      <if test="badname != null">
+        #{badname,jdbcType=NVARCHAR},
+      </if>
+      <if test="modelnumbers != null">
+        #{modelnumbers,jdbcType=NVARCHAR},
+      </if>
+      <if test="number != null">
+        #{number,jdbcType=NUMERIC},
+      </if>
+      <if test="belongs != null">
+        #{belongs,jdbcType=NVARCHAR},
+      </if>
+      <if test="description != null">
+        #{description,jdbcType=NVARCHAR},
+      </if>
+      <if test="sitenum != null">
+        #{sitenum,jdbcType=NVARCHAR},
+      </if>
+      <if test="corpnum != null">
+        #{corpnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="bugnum != null">
+        #{bugnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="recordpersonnel != null">
+        #{recordpersonnel,jdbcType=NVARCHAR},
+      </if>
+      <if test="manufacturers != null">
+        #{manufacturers,jdbcType=NVARCHAR},
+      </if>
+      <if test="eqnum != null">
+        #{eqnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="location != null">
+        #{location,jdbcType=NVARCHAR},
+      </if>
+      <if test="neweqnum != null">
+        #{neweqnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="replacetime != null">
+        #{replacetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sparename != null">
+        #{sparename,jdbcType=NVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.EliminatingeqExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from ELIMINATINGEQ
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update ELIMINATINGEQ
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=NUMERIC},
+      </if>
+      <if test="record.badname != null">
+        BADNAME = #{record.badname,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.modelnumbers != null">
+        MODELNUMBERS = #{record.modelnumbers,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.number != null">
+        NUMBER = #{record.number,jdbcType=NUMERIC},
+      </if>
+      <if test="record.belongs != null">
+        BELONGS = #{record.belongs,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.description != null">
+        DESCRIPTION = #{record.description,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.sitenum != null">
+        SITENUM = #{record.sitenum,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.corpnum != null">
+        CORPNUM = #{record.corpnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.bugnum != null">
+        BUGNUM = #{record.bugnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.recordpersonnel != null">
+        RECORDPERSONNEL = #{record.recordpersonnel,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.manufacturers != null">
+        MANUFACTURERS = #{record.manufacturers,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.eqnum != null">
+        EQNUM = #{record.eqnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.location != null">
+        LOCATION = #{record.location,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.neweqnum != null">
+        NEWEQNUM = #{record.neweqnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.replacetime != null">
+        REPLACETIME = #{record.replacetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.sparename != null">
+        SPARENAME = #{record.sparename,jdbcType=NVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update ELIMINATINGEQ
+    set ID = #{record.id,jdbcType=NUMERIC},
+      BADNAME = #{record.badname,jdbcType=NVARCHAR},
+      MODELNUMBERS = #{record.modelnumbers,jdbcType=NVARCHAR},
+      NUMBER = #{record.number,jdbcType=NUMERIC},
+      BELONGS = #{record.belongs,jdbcType=NVARCHAR},
+      DESCRIPTION = #{record.description,jdbcType=NVARCHAR},
+      SITENUM = #{record.sitenum,jdbcType=NVARCHAR},
+      CORPNUM = #{record.corpnum,jdbcType=NVARCHAR},
+      BUGNUM = #{record.bugnum,jdbcType=NVARCHAR},
+      RECORDPERSONNEL = #{record.recordpersonnel,jdbcType=NVARCHAR},
+      MANUFACTURERS = #{record.manufacturers,jdbcType=NVARCHAR},
+      EQNUM = #{record.eqnum,jdbcType=NVARCHAR},
+      LOCATION = #{record.location,jdbcType=NVARCHAR},
+      NEWEQNUM = #{record.neweqnum,jdbcType=NVARCHAR},
+      REPLACETIME = #{record.replacetime,jdbcType=TIMESTAMP},
+      SPARENAME = #{record.sparename,jdbcType=NVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Eliminatingeq">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update ELIMINATINGEQ
+    <set>
+      <if test="badname != null">
+        BADNAME = #{badname,jdbcType=NVARCHAR},
+      </if>
+      <if test="modelnumbers != null">
+        MODELNUMBERS = #{modelnumbers,jdbcType=NVARCHAR},
+      </if>
+      <if test="number != null">
+        NUMBER = #{number,jdbcType=NUMERIC},
+      </if>
+      <if test="belongs != null">
+        BELONGS = #{belongs,jdbcType=NVARCHAR},
+      </if>
+      <if test="description != null">
+        DESCRIPTION = #{description,jdbcType=NVARCHAR},
+      </if>
+      <if test="sitenum != null">
+        SITENUM = #{sitenum,jdbcType=NVARCHAR},
+      </if>
+      <if test="corpnum != null">
+        CORPNUM = #{corpnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="bugnum != null">
+        BUGNUM = #{bugnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="recordpersonnel != null">
+        RECORDPERSONNEL = #{recordpersonnel,jdbcType=NVARCHAR},
+      </if>
+      <if test="manufacturers != null">
+        MANUFACTURERS = #{manufacturers,jdbcType=NVARCHAR},
+      </if>
+      <if test="eqnum != null">
+        EQNUM = #{eqnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="location != null">
+        LOCATION = #{location,jdbcType=NVARCHAR},
+      </if>
+      <if test="neweqnum != null">
+        NEWEQNUM = #{neweqnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="replacetime != null">
+        REPLACETIME = #{replacetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sparename != null">
+        SPARENAME = #{sparename,jdbcType=NVARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=NUMERIC}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Eliminatingeq">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update ELIMINATINGEQ
+    set BADNAME = #{badname,jdbcType=NVARCHAR},
+      MODELNUMBERS = #{modelnumbers,jdbcType=NVARCHAR},
+      NUMBER = #{number,jdbcType=NUMERIC},
+      BELONGS = #{belongs,jdbcType=NVARCHAR},
+      DESCRIPTION = #{description,jdbcType=NVARCHAR},
+      SITENUM = #{sitenum,jdbcType=NVARCHAR},
+      CORPNUM = #{corpnum,jdbcType=NVARCHAR},
+      BUGNUM = #{bugnum,jdbcType=NVARCHAR},
+      RECORDPERSONNEL = #{recordpersonnel,jdbcType=NVARCHAR},
+      MANUFACTURERS = #{manufacturers,jdbcType=NVARCHAR},
+      EQNUM = #{eqnum,jdbcType=NVARCHAR},
+      LOCATION = #{location,jdbcType=NVARCHAR},
+      NEWEQNUM = #{neweqnum,jdbcType=NVARCHAR},
+      REPLACETIME = #{replacetime,jdbcType=TIMESTAMP},
+      SPARENAME = #{sparename,jdbcType=NVARCHAR}
+    where ID = #{id,jdbcType=NUMERIC}
+  </update>
+</mapper>

src/main/resources/mybatis/auto/StopAnalysisDetailMapper.xml

@@ -0,0 +1,335 @@
+<?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.auto.StopAnalysisDetailMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.StopAnalysisDetail">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="VARCHAR" property="id" />
+    <result column="MAINID" jdbcType="VARCHAR" property="mainid" />
+    <result column="PID" jdbcType="VARCHAR" property="pid" />
+    <result column="NAME" jdbcType="VARCHAR" property="name" />
+    <result column="JUDEGVULUE" jdbcType="VARCHAR" property="judegvulue" />
+    <result column="URL" jdbcType="VARCHAR" property="url" />
+    <result column="ISPARENT" jdbcType="DECIMAL" property="isparent" />
+    <result column="RID" jdbcType="VARCHAR" property="rid" />
+    <result column="WTID" jdbcType="VARCHAR" property="wtid" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    ID, MAINID, PID, NAME, JUDEGVULUE, URL, ISPARENT, RID, WTID
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.StopAnalysisDetailExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from STOPANALYSISDETAIL
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from STOPANALYSISDETAIL
+    where ID = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from STOPANALYSISDETAIL
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.StopAnalysisDetailExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from STOPANALYSISDETAIL
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.StopAnalysisDetail">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into STOPANALYSISDETAIL (ID, MAINID, PID, 
+      NAME, JUDEGVULUE, URL, 
+      ISPARENT, RID, WTID
+      )
+    values (#{id,jdbcType=VARCHAR}, #{mainid,jdbcType=VARCHAR}, #{pid,jdbcType=VARCHAR}, 
+      #{name,jdbcType=VARCHAR}, #{judegvulue,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR}, 
+      #{isparent,jdbcType=DECIMAL}, #{rid,jdbcType=VARCHAR}, #{wtid,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.StopAnalysisDetail">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into STOPANALYSISDETAIL
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="mainid != null">
+        MAINID,
+      </if>
+      <if test="pid != null">
+        PID,
+      </if>
+      <if test="name != null">
+        NAME,
+      </if>
+      <if test="judegvulue != null">
+        JUDEGVULUE,
+      </if>
+      <if test="url != null">
+        URL,
+      </if>
+      <if test="isparent != null">
+        ISPARENT,
+      </if>
+      <if test="rid != null">
+        RID,
+      </if>
+      <if test="wtid != null">
+        WTID,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="mainid != null">
+        #{mainid,jdbcType=VARCHAR},
+      </if>
+      <if test="pid != null">
+        #{pid,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="judegvulue != null">
+        #{judegvulue,jdbcType=VARCHAR},
+      </if>
+      <if test="url != null">
+        #{url,jdbcType=VARCHAR},
+      </if>
+      <if test="isparent != null">
+        #{isparent,jdbcType=DECIMAL},
+      </if>
+      <if test="rid != null">
+        #{rid,jdbcType=VARCHAR},
+      </if>
+      <if test="wtid != null">
+        #{wtid,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.StopAnalysisDetailExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from STOPANALYSISDETAIL
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update STOPANALYSISDETAIL
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.mainid != null">
+        MAINID = #{record.mainid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pid != null">
+        PID = #{record.pid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        NAME = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.judegvulue != null">
+        JUDEGVULUE = #{record.judegvulue,jdbcType=VARCHAR},
+      </if>
+      <if test="record.url != null">
+        URL = #{record.url,jdbcType=VARCHAR},
+      </if>
+      <if test="record.isparent != null">
+        ISPARENT = #{record.isparent,jdbcType=DECIMAL},
+      </if>
+      <if test="record.rid != null">
+        RID = #{record.rid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.wtid != null">
+        WTID = #{record.wtid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update STOPANALYSISDETAIL
+    set ID = #{record.id,jdbcType=VARCHAR},
+      MAINID = #{record.mainid,jdbcType=VARCHAR},
+      PID = #{record.pid,jdbcType=VARCHAR},
+      NAME = #{record.name,jdbcType=VARCHAR},
+      JUDEGVULUE = #{record.judegvulue,jdbcType=VARCHAR},
+      URL = #{record.url,jdbcType=VARCHAR},
+      ISPARENT = #{record.isparent,jdbcType=DECIMAL},
+      RID = #{record.rid,jdbcType=VARCHAR},
+      WTID = #{record.wtid,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.StopAnalysisDetail">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update STOPANALYSISDETAIL
+    <set>
+      <if test="mainid != null">
+        MAINID = #{mainid,jdbcType=VARCHAR},
+      </if>
+      <if test="pid != null">
+        PID = #{pid,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        NAME = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="judegvulue != null">
+        JUDEGVULUE = #{judegvulue,jdbcType=VARCHAR},
+      </if>
+      <if test="url != null">
+        URL = #{url,jdbcType=VARCHAR},
+      </if>
+      <if test="isparent != null">
+        ISPARENT = #{isparent,jdbcType=DECIMAL},
+      </if>
+      <if test="rid != null">
+        RID = #{rid,jdbcType=VARCHAR},
+      </if>
+      <if test="wtid != null">
+        WTID = #{wtid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.StopAnalysisDetail">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update STOPANALYSISDETAIL
+    set MAINID = #{mainid,jdbcType=VARCHAR},
+      PID = #{pid,jdbcType=VARCHAR},
+      NAME = #{name,jdbcType=VARCHAR},
+      JUDEGVULUE = #{judegvulue,jdbcType=VARCHAR},
+      URL = #{url,jdbcType=VARCHAR},
+      ISPARENT = #{isparent,jdbcType=DECIMAL},
+      RID = #{rid,jdbcType=VARCHAR},
+      WTID = #{wtid,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

src/main/resources/mybatis/auto/StopAnalysisDetailVoMapper.xml

@@ -0,0 +1,311 @@
+<?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.auto.StopAnalysisDetailVoMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.StopAnalysisDetailVo">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="VARCHAR" property="id" />
+    <result column="PID" jdbcType="VARCHAR" property="pid" />
+    <result column="NAME" jdbcType="VARCHAR" property="name" />
+    <result column="JUDEGVULUE" jdbcType="VARCHAR" property="judegvulue" />
+    <result column="URL" jdbcType="VARCHAR" property="url" />
+    <result column="ISPARENT" jdbcType="DECIMAL" property="isparent" />
+    <result column="WTID" jdbcType="VARCHAR" property="wtid" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    ID, PID, NAME, JUDEGVULUE, URL, ISPARENT, WTID
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.StopAnalysisDetailVoExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from STOPANALYSISDETAILVO
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from STOPANALYSISDETAILVO
+    where ID = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from STOPANALYSISDETAILVO
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.StopAnalysisDetailVoExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from STOPANALYSISDETAILVO
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.StopAnalysisDetailVo">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into STOPANALYSISDETAILVO (ID, PID, NAME, 
+      JUDEGVULUE, URL, ISPARENT, 
+      WTID)
+    values (#{id,jdbcType=VARCHAR}, #{pid,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
+      #{judegvulue,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR}, #{isparent,jdbcType=DECIMAL}, 
+      #{wtid,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.StopAnalysisDetailVo">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into STOPANALYSISDETAILVO
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="pid != null">
+        PID,
+      </if>
+      <if test="name != null">
+        NAME,
+      </if>
+      <if test="judegvulue != null">
+        JUDEGVULUE,
+      </if>
+      <if test="url != null">
+        URL,
+      </if>
+      <if test="isparent != null">
+        ISPARENT,
+      </if>
+      <if test="wtid != null">
+        WTID,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="pid != null">
+        #{pid,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="judegvulue != null">
+        #{judegvulue,jdbcType=VARCHAR},
+      </if>
+      <if test="url != null">
+        #{url,jdbcType=VARCHAR},
+      </if>
+      <if test="isparent != null">
+        #{isparent,jdbcType=DECIMAL},
+      </if>
+      <if test="wtid != null">
+        #{wtid,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.StopAnalysisDetailVoExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from STOPANALYSISDETAILVO
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update STOPANALYSISDETAILVO
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pid != null">
+        PID = #{record.pid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        NAME = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.judegvulue != null">
+        JUDEGVULUE = #{record.judegvulue,jdbcType=VARCHAR},
+      </if>
+      <if test="record.url != null">
+        URL = #{record.url,jdbcType=VARCHAR},
+      </if>
+      <if test="record.isparent != null">
+        ISPARENT = #{record.isparent,jdbcType=DECIMAL},
+      </if>
+      <if test="record.wtid != null">
+        WTID = #{record.wtid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update STOPANALYSISDETAILVO
+    set ID = #{record.id,jdbcType=VARCHAR},
+      PID = #{record.pid,jdbcType=VARCHAR},
+      NAME = #{record.name,jdbcType=VARCHAR},
+      JUDEGVULUE = #{record.judegvulue,jdbcType=VARCHAR},
+      URL = #{record.url,jdbcType=VARCHAR},
+      ISPARENT = #{record.isparent,jdbcType=DECIMAL},
+      WTID = #{record.wtid,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.StopAnalysisDetailVo">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update STOPANALYSISDETAILVO
+    <set>
+      <if test="pid != null">
+        PID = #{pid,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        NAME = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="judegvulue != null">
+        JUDEGVULUE = #{judegvulue,jdbcType=VARCHAR},
+      </if>
+      <if test="url != null">
+        URL = #{url,jdbcType=VARCHAR},
+      </if>
+      <if test="isparent != null">
+        ISPARENT = #{isparent,jdbcType=DECIMAL},
+      </if>
+      <if test="wtid != null">
+        WTID = #{wtid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.StopAnalysisDetailVo">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update STOPANALYSISDETAILVO
+    set PID = #{pid,jdbcType=VARCHAR},
+      NAME = #{name,jdbcType=VARCHAR},
+      JUDEGVULUE = #{judegvulue,jdbcType=VARCHAR},
+      URL = #{url,jdbcType=VARCHAR},
+      ISPARENT = #{isparent,jdbcType=DECIMAL},
+      WTID = #{wtid,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <delete id="deleteAll" >
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from STOPANALYSISDETAILVO
+
+  </delete>
+</mapper>

src/main/resources/mybatis/auto/StopAnalysisMapper.xml

@@ -0,0 +1,271 @@
+<?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.auto.StopAnalysisMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.StopAnalysis">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="VARCHAR" property="id" />
+    <result column="WPID" jdbcType="VARCHAR" property="wpid" />
+    <result column="RULEID" jdbcType="VARCHAR" property="ruleid" />
+    <result column="TIMETYPE" jdbcType="VARCHAR" property="timetype" />
+    <result column="JUDEGDATE" jdbcType="TIMESTAMP" property="judegdate" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    ID, WPID, RULEID, TIMETYPE, JUDEGDATE
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.StopAnalysisExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from STOPANALYSIS
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from STOPANALYSIS
+    where ID = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from STOPANALYSIS
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.StopAnalysisExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from STOPANALYSIS
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.StopAnalysis">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into STOPANALYSIS (ID, WPID, RULEID, 
+      TIMETYPE, JUDEGDATE)
+    values (#{id,jdbcType=VARCHAR}, #{wpid,jdbcType=VARCHAR}, #{ruleid,jdbcType=VARCHAR}, 
+      #{timetype,jdbcType=VARCHAR}, #{judegdate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.StopAnalysis">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into STOPANALYSIS
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="wpid != null">
+        WPID,
+      </if>
+      <if test="ruleid != null">
+        RULEID,
+      </if>
+      <if test="timetype != null">
+        TIMETYPE,
+      </if>
+      <if test="judegdate != null">
+        JUDEGDATE,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="wpid != null">
+        #{wpid,jdbcType=VARCHAR},
+      </if>
+      <if test="ruleid != null">
+        #{ruleid,jdbcType=VARCHAR},
+      </if>
+      <if test="timetype != null">
+        #{timetype,jdbcType=VARCHAR},
+      </if>
+      <if test="judegdate != null">
+        #{judegdate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.StopAnalysisExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from STOPANALYSIS
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update STOPANALYSIS
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.wpid != null">
+        WPID = #{record.wpid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ruleid != null">
+        RULEID = #{record.ruleid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.timetype != null">
+        TIMETYPE = #{record.timetype,jdbcType=VARCHAR},
+      </if>
+      <if test="record.judegdate != null">
+        JUDEGDATE = #{record.judegdate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update STOPANALYSIS
+    set ID = #{record.id,jdbcType=VARCHAR},
+      WPID = #{record.wpid,jdbcType=VARCHAR},
+      RULEID = #{record.ruleid,jdbcType=VARCHAR},
+      TIMETYPE = #{record.timetype,jdbcType=VARCHAR},
+      JUDEGDATE = #{record.judegdate,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.StopAnalysis">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update STOPANALYSIS
+    <set>
+      <if test="wpid != null">
+        WPID = #{wpid,jdbcType=VARCHAR},
+      </if>
+      <if test="ruleid != null">
+        RULEID = #{ruleid,jdbcType=VARCHAR},
+      </if>
+      <if test="timetype != null">
+        TIMETYPE = #{timetype,jdbcType=VARCHAR},
+      </if>
+      <if test="judegdate != null">
+        JUDEGDATE = #{judegdate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.StopAnalysis">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update STOPANALYSIS
+    set WPID = #{wpid,jdbcType=VARCHAR},
+      RULEID = #{ruleid,jdbcType=VARCHAR},
+      TIMETYPE = #{timetype,jdbcType=VARCHAR},
+      JUDEGDATE = #{judegdate,jdbcType=TIMESTAMP}
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

src/main/resources/mybatis/auto/StopAnalysismainMapper.xml

@@ -0,0 +1,271 @@
+<?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.auto.StopAnalysismainMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.StopAnalysismain">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="VARCHAR" property="id" />
+    <result column="MAINID" jdbcType="VARCHAR" property="mainid" />
+    <result column="WTID" jdbcType="VARCHAR" property="wtid" />
+    <result column="MODELID" jdbcType="VARCHAR" property="modelid" />
+    <result column="JUDEGVULUE" jdbcType="VARCHAR" property="judegvulue" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    ID, MAINID, WTID, MODELID, JUDEGVULUE
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.StopAnalysismainExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from STOPANALYSISMAIN
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from STOPANALYSISMAIN
+    where ID = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from STOPANALYSISMAIN
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.StopAnalysismainExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from STOPANALYSISMAIN
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.StopAnalysismain">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into STOPANALYSISMAIN (ID, MAINID, WTID, 
+      MODELID, JUDEGVULUE)
+    values (#{id,jdbcType=VARCHAR}, #{mainid,jdbcType=VARCHAR}, #{wtid,jdbcType=VARCHAR}, 
+      #{modelid,jdbcType=VARCHAR}, #{judegvulue,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.StopAnalysismain">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into STOPANALYSISMAIN
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="mainid != null">
+        MAINID,
+      </if>
+      <if test="wtid != null">
+        WTID,
+      </if>
+      <if test="modelid != null">
+        MODELID,
+      </if>
+      <if test="judegvulue != null">
+        JUDEGVULUE,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="mainid != null">
+        #{mainid,jdbcType=VARCHAR},
+      </if>
+      <if test="wtid != null">
+        #{wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="modelid != null">
+        #{modelid,jdbcType=VARCHAR},
+      </if>
+      <if test="judegvulue != null">
+        #{judegvulue,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.StopAnalysismainExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from STOPANALYSISMAIN
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update STOPANALYSISMAIN
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.mainid != null">
+        MAINID = #{record.mainid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.wtid != null">
+        WTID = #{record.wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.modelid != null">
+        MODELID = #{record.modelid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.judegvulue != null">
+        JUDEGVULUE = #{record.judegvulue,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update STOPANALYSISMAIN
+    set ID = #{record.id,jdbcType=VARCHAR},
+      MAINID = #{record.mainid,jdbcType=VARCHAR},
+      WTID = #{record.wtid,jdbcType=VARCHAR},
+      MODELID = #{record.modelid,jdbcType=VARCHAR},
+      JUDEGVULUE = #{record.judegvulue,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.StopAnalysismain">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update STOPANALYSISMAIN
+    <set>
+      <if test="mainid != null">
+        MAINID = #{mainid,jdbcType=VARCHAR},
+      </if>
+      <if test="wtid != null">
+        WTID = #{wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="modelid != null">
+        MODELID = #{modelid,jdbcType=VARCHAR},
+      </if>
+      <if test="judegvulue != null">
+        JUDEGVULUE = #{judegvulue,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.StopAnalysismain">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update STOPANALYSISMAIN
+    set MAINID = #{mainid,jdbcType=VARCHAR},
+      WTID = #{wtid,jdbcType=VARCHAR},
+      MODELID = #{modelid,jdbcType=VARCHAR},
+      JUDEGVULUE = #{judegvulue,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

src/main/resources/mybatis/auto/StopAnalysismainVoMapper.xml

@@ -0,0 +1,265 @@
+<?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.auto.StopAnalysismainVoMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.StopAnalysismainVo">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="VARCHAR" property="id" />
+    <result column="WTID" jdbcType="VARCHAR" property="wtid" />
+    <result column="MODELID" jdbcType="VARCHAR" property="modelid" />
+    <result column="JUDEGVULUE" jdbcType="VARCHAR" property="judegvulue" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    ID, WTID, MODELID, JUDEGVULUE
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.StopAnalysismainVoExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from STOPANALYSISMAINVO
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from STOPANALYSISMAINVO
+    where ID = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from STOPANALYSISMAINVO
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.StopAnalysismainVoExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from STOPANALYSISMAINVO
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.StopAnalysismainVo">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into STOPANALYSISMAINVO (ID, WTID, MODELID, 
+      JUDEGVULUE)
+    values (#{id,jdbcType=VARCHAR}, #{wtid,jdbcType=VARCHAR}, #{modelid,jdbcType=VARCHAR}, 
+      #{judegvulue,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.StopAnalysismainVo">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into STOPANALYSISMAINVO
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="wtid != null">
+        WTID,
+      </if>
+      <if test="modelid != null">
+        MODELID,
+      </if>
+      <if test="judegvulue != null">
+        JUDEGVULUE,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="wtid != null">
+        #{wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="modelid != null">
+        #{modelid,jdbcType=VARCHAR},
+      </if>
+      <if test="judegvulue != null">
+        #{judegvulue,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.StopAnalysismainVoExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from STOPANALYSISMAINVO
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update STOPANALYSISMAINVO
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.wtid != null">
+        WTID = #{record.wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.modelid != null">
+        MODELID = #{record.modelid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.judegvulue != null">
+        JUDEGVULUE = #{record.judegvulue,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update STOPANALYSISMAINVO
+    set ID = #{record.id,jdbcType=VARCHAR},
+      WTID = #{record.wtid,jdbcType=VARCHAR},
+      MODELID = #{record.modelid,jdbcType=VARCHAR},
+      JUDEGVULUE = #{record.judegvulue,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.StopAnalysismainVo">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update STOPANALYSISMAINVO
+    <set>
+      <if test="wtid != null">
+        WTID = #{wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="modelid != null">
+        MODELID = #{modelid,jdbcType=VARCHAR},
+      </if>
+      <if test="judegvulue != null">
+        JUDEGVULUE = #{judegvulue,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.StopAnalysismainVo">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update STOPANALYSISMAINVO
+    set WTID = #{wtid,jdbcType=VARCHAR},
+      MODELID = #{modelid,jdbcType=VARCHAR},
+      JUDEGVULUE = #{judegvulue,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+
+  <delete id="deleteAll" >
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from STOPANALYSISMAINVO
+
+  </delete>
+</mapper>

src/test/java/test/HealthTest.java

@@ -86,7 +86,7 @@ public class HealthTest {
 //        System.out.println(map1.size());
 
 
-        Map<String, Object> map1 =healthSubController.getWtMttrandMtbfByBj(wtid);
+        Map<String, Object> map1 =healthSubController.findPowerChar("NG01_79");
         System.out.println(map1.size());
 
 

src/test/java/test/MatrixByWpPushTest.java

@@ -2,12 +2,11 @@ package test;
 
 import com.gyee.SpringbootStart;
 import com.gyee.frame.common.spring.SpringUtils;
+import com.gyee.frame.controller.monitor.MonitorPushController;
 import com.gyee.frame.service.websocket.MatrixPushByWpService;
 import lombok.SneakyThrows;
 import org.springframework.boot.SpringApplication;
 
-import java.util.Map;
-
 public class MatrixByWpPushTest {
 
     @SneakyThrows
@@ -23,16 +22,16 @@ public class MatrixByWpPushTest {
         String month="1";
 
         MatrixPushByWpService matrixPushByWpService= SpringUtils.getBean("matrixPushByWpService");
+        MonitorPushController monitorPushController= SpringUtils.getBean("monitorPushController");
 
 
 
 
-
-        Map<String, Object> map = matrixPushByWpService.findMatrixById("MG01_01");
-
-
-
-         System.out.println(map.size());
+//        Map<String, Object> map = matrixPushByWpService.findMatrixById("MG01_01");
+//
+//
+//
+//         System.out.println(map.size());
 
 
 
@@ -69,5 +68,10 @@ public class MatrixByWpPushTest {
 //
 //
 //
+
+
+//        Map<String, Object> map=monitorPushController.findGeneralAppearance(wpId);
+//
+//        System.out.println(map.size());
     }
 }

src/test/java/test/RecommenTest.java

@@ -4,11 +4,14 @@ import com.gyee.SpringbootStart;
 import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.common.spring.SpringUtils;
 import com.gyee.frame.controller.recommen.RecommenController;
+import com.gyee.frame.model.custom.Tablepar;
+import com.gyee.frame.model.custom.WoBugVo;
 import lombok.SneakyThrows;
 import org.springframework.boot.SpringApplication;
 
 import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 
 public class RecommenTest {
 
@@ -87,14 +90,14 @@ public class RecommenTest {
 //        System.out.println("**********************************************************************************");
 //
 //
-        System.out.println("**********************************************************************************");
-        AjaxResult ajaxResult1 = recommenController.findAllChartjz("MHS_FDC","2");
-        AjaxResult ajaxResult2 = recommenController.findAllChartjz("MHS01_GC","2");
-        AjaxResult ajaxResult3 = recommenController.findAllChartjz("MHS01_XL","2");
-        AjaxResult ajaxResult4 = recommenController.findAllChartjz("MG01_01","2");
-
-
-        System.out.println("**********************************************************************************");
+//        System.out.println("**********************************************************************************");
+//        AjaxResult ajaxResult1 = recommenController.findAllChartjz("MHS_FDC","2");
+//        AjaxResult ajaxResult2 = recommenController.findAllChartjz("MHS01_GC","2");
+//        AjaxResult ajaxResult3 = recommenController.findAllChartjz("MHS01_XL","2");
+//        AjaxResult ajaxResult4 = recommenController.findAllChartjz("MG01_01","2");
+//
+//
+//        System.out.println("**********************************************************************************");
 //
 //       map.put("yslchart", yslchart);
 //        map.put("lslchart", lslchart);
@@ -153,17 +156,17 @@ public class RecommenTest {
 //        System.out.println(test);
 //
 //        System.out.println("**********************************************************************************");
-//        Tablepar tablepar = new Tablepar();
-//        tablepar.setPageNum(1);
-//        tablepar.setPageSize(10);
-//       AjaxResult ajaxResult2 = recommenController.findWobugeqByLocation(tablepar,"02055002");
-//
-//        List<Wobugeq> test2=(List<Wobugeq>)ajaxResult2.get("data");
-//
-//        for(Wobugeq wtd:test2)
-//        {
-//            System.out.println(wtd.getBugnum()+"----------------"+wtd.getArrivaltime()+"----------------"+wtd.getProdtdeptopinion());
-//        }
+        Tablepar tablepar = new Tablepar();
+        tablepar.setPageNum(1);
+        tablepar.setPageSize(10);
+       AjaxResult ajaxResult2 = recommenController.findWobugeqByLocation(tablepar,"02055002");
+
+        List<WoBugVo> test2=(List<WoBugVo>)ajaxResult2.get("data");
+
+        for(WoBugVo wtd:test2)
+        {
+            System.out.println(wtd.getStatus()+"----------------"+wtd.getXqms()+"----------------"+wtd.getXqry());
+        }
 //        System.out.println("**********************************************************************************");
 //
 //        AjaxResult ajaxResult2 = recommenController.unfinishedList(null,null,"2016-08-22","2020-08-22");

src/test/java/test/RedisTest.java

@@ -0,0 +1,29 @@
+package test;
+
+import com.gyee.SpringbootStart;
+import com.gyee.frame.common.spring.InitialRedis;
+import lombok.SneakyThrows;
+import org.springframework.boot.SpringApplication;
+
+public class RedisTest {
+
+    @SneakyThrows
+    public static void main(String[] args) {
+
+        SpringApplication.run(SpringbootStart.class, args);
+
+
+
+        InitialRedis initialRedis=new InitialRedis();
+        System.out.println("初始化开始！");
+//        initialRedis.intialWindturbinepowercurvefitting();
+//        initialRedis.intialWpScatter();
+//        initialRedis.intialPjScatter();
+//        initialRedis.intialLnScatter();
+        initialRedis.intialWtScatter();
+        System.out.println("初始化完成！");
+
+    }
+
+
+}

src/test/java/test/StopAnalysisTest.java

@@ -0,0 +1,48 @@
+package test;
+
+import com.gyee.SpringbootStart;
+import com.gyee.frame.common.spring.SpringUtils;
+import com.gyee.frame.controller.health.StopAnalysisController;
+import lombok.SneakyThrows;
+import org.springframework.boot.SpringApplication;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Map;
+
+public class StopAnalysisTest {
+
+    @SneakyThrows
+    public static void main(String[] args) {
+
+        SpringApplication.run(SpringbootStart.class, args);
+
+
+        Calendar c = Calendar.getInstance();
+
+        c.set(Calendar.HOUR_OF_DAY, 0);
+        c.set(Calendar.MINUTE, 0);
+        c.set(Calendar.SECOND, 0);
+        c.set(Calendar.MILLISECOND, 0);
+        c.set(Calendar.DAY_OF_MONTH,24);
+        c.set(Calendar.MONTH,2);
+        c.set(Calendar.YEAR,2021);
+
+        Date date = c.getTime();
+
+        String wtid="MG01_07";
+        StopAnalysisController stopAnalysisController= SpringUtils.getBean("stopAnalysisController");
+        Map<String, Object> map =stopAnalysisController.stopAnalysisList("SBQ_FDC","1","2");
+//
+//
+        System.out.println(map);
+
+        System.out.println("***************************************************************************************");
+
+
+    }
+
+
+
+
+}