Browse Source

风机绩效表明细风能利用率修改

shilin 4 years ago
parent
commit
6d03f4e8f8
45 changed files with 16598 additions and 64 deletions
  1. 10 10
      pom.xml
  2. 128 4
      src/main/java/com/gyee/frame/controller/recommen/RecommenController.java
  3. 30 0
      src/main/java/com/gyee/frame/controller/report/WtHealthReportController.java
  4. 100 0
      src/main/java/com/gyee/frame/mapper/auto/EquipmentSqlMapper.java
  5. 96 0
      src/main/java/com/gyee/frame/mapper/auto/MismapSqlMapper.java
  6. 97 0
      src/main/java/com/gyee/frame/mapper/auto/ShbrUserMapper.java
  7. 97 0
      src/main/java/com/gyee/frame/mapper/auto/ShbraceletPointkeyMapper.java
  8. 97 0
      src/main/java/com/gyee/frame/mapper/auto/ShbraceletUserMapper.java
  9. 97 0
      src/main/java/com/gyee/frame/mapper/auto/WindturbineSqlMapper.java
  10. 1731 0
      src/main/java/com/gyee/frame/model/auto/EquipmentSql.java
  11. 3774 0
      src/main/java/com/gyee/frame/model/auto/EquipmentSqlExample.java
  12. 79 0
      src/main/java/com/gyee/frame/model/auto/MismapSql.java
  13. 442 0
      src/main/java/com/gyee/frame/model/auto/MismapSqlExample.java
  14. 278 0
      src/main/java/com/gyee/frame/model/auto/ShbrUser.java
  15. 843 0
      src/main/java/com/gyee/frame/model/auto/ShbrUserExample.java
  16. 146 0
      src/main/java/com/gyee/frame/model/auto/ShbraceletPointkey.java
  17. 553 0
      src/main/java/com/gyee/frame/model/auto/ShbraceletPointkeyExample.java
  18. 146 0
      src/main/java/com/gyee/frame/model/auto/ShbraceletUser.java
  19. 543 0
      src/main/java/com/gyee/frame/model/auto/ShbraceletUserExample.java
  20. 1004 0
      src/main/java/com/gyee/frame/model/auto/WindturbineSql.java
  21. 2173 0
      src/main/java/com/gyee/frame/model/auto/WindturbineSqlExample.java
  22. 12 0
      src/main/java/com/gyee/frame/model/custom/MainTrackVo.java
  23. 111 0
      src/main/java/com/gyee/frame/model/custom/ZtreeNode.java
  24. 117 0
      src/main/java/com/gyee/frame/service/EquipmentSqlService.java
  25. 118 0
      src/main/java/com/gyee/frame/service/MismapSqlService.java
  26. 3 0
      src/main/java/com/gyee/frame/service/RecommenmainService.java
  27. 113 0
      src/main/java/com/gyee/frame/service/ShbrUserService.java
  28. 112 0
      src/main/java/com/gyee/frame/service/ShbraceletPointkeyService.java
  29. 116 0
      src/main/java/com/gyee/frame/service/ShbraceletUserService.java
  30. 122 0
      src/main/java/com/gyee/frame/service/WindturbineSqlService.java
  31. 49 0
      src/main/java/com/gyee/frame/service/WobugeqService.java
  32. 42 0
      src/main/java/com/gyee/frame/service/WtReportMainService.java
  33. 192 5
      src/main/java/com/gyee/frame/service/recommen/RecommenService.java
  34. 20 0
      src/main/java/com/gyee/frame/service/report/WtHealthReportService.java
  35. 173 0
      src/main/java/com/gyee/frame/util/TreeUtil.java
  36. 7 7
      src/main/resources/application-dev.yml
  37. 1 1
      src/main/resources/application.yml
  38. 15 13
      src/main/resources/mybatis-generator.xml
  39. 1020 0
      src/main/resources/mybatis/auto/EquipmentSqlMapper.xml
  40. 224 0
      src/main/resources/mybatis/auto/MismapSqlMapper.xml
  41. 318 0
      src/main/resources/mybatis/auto/ShbrUserMapper.xml
  42. 256 0
      src/main/resources/mybatis/auto/ShbraceletPointkeyMapper.xml
  43. 256 0
      src/main/resources/mybatis/auto/ShbraceletUserMapper.xml
  44. 667 0
      src/main/resources/mybatis/auto/WindturbineSqlMapper.xml
  45. 70 24
      src/test/java/test/RecommenTest.java

+ 10 - 10
pom.xml

@@ -300,17 +300,17 @@
 <!--						<artifactId>mysql-connector-java</artifactId>-->
 <!--						<version>${mysql.version}</version>-->
 <!--					</dependency>-->
-<!--			<dependency>-->
-<!--                <groupId>com.oracle</groupId>-->
-<!--                <artifactId>ojdbc6</artifactId>-->
-<!--                <version>11.2.0.3</version>-->
-<!--            </dependency>-->
+			<dependency>
+                <groupId>com.oracle</groupId>
+                <artifactId>ojdbc6</artifactId>
+                <version>11.2.0.3</version>
+            </dependency>
 
-					<dependency>
-					<groupId>com.microsoft.sqlserver</groupId>
-					<artifactId>sqljdbc4</artifactId>
-					<version>4.0</version>
-				    </dependency>
+<!--					<dependency>-->
+<!--					<groupId>com.microsoft.sqlserver</groupId>-->
+<!--					<artifactId>sqljdbc4</artifactId>-->
+<!--					<version>4.0</version>-->
+<!--				    </dependency>-->
 
         </dependencies>
     </plugin>

+ 128 - 4
src/main/java/com/gyee/frame/controller/recommen/RecommenController.java

@@ -1,10 +1,15 @@
 package com.gyee.frame.controller.recommen;
 
+import com.github.pagehelper.PageInfo;
 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.MainTrackVo;
+import com.gyee.frame.model.custom.Tablepar;
+import com.gyee.frame.model.custom.WoBugEqVo;
 import com.gyee.frame.service.recommen.RecommenService;
+import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -12,10 +17,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Controller
 @RequestMapping("/recommen")
@@ -270,4 +272,126 @@ public class RecommenController {
 
     }
 
+    /**
+     * 获得未完成消缺单列表
+     * @return
+     */
+    public AjaxResult unfinishedList(String wpId, String wtId, String beginDate, String endDate) {
+
+        List<WoBugEqVo> vos=new ArrayList<>();
+
+        if(StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate))
+        {
+            vos=recommenService.unfinishedList(wpId,wtId, DateUtils.parseDate(beginDate),DateUtils.parseDate(endDate));
+        }
+
+        if (null!=vos) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+        }
+
+    }
+    /**
+     * 获得完成消缺单列表
+     * @return
+     */
+    public AjaxResult finishedList(String wpId, String wtId, String beginDate, String endDate) {
+
+        List<WoBugEqVo> vos=new ArrayList<>();
+
+        if(StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate))
+        {
+            vos=recommenService.finishedList(wpId,wtId, DateUtils.parseDate(beginDate),DateUtils.parseDate(endDate) );
+        }
+
+        if (null!=vos) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+        }
+
+    }
+
+
+    /**
+     * 通过用户姓名和开始检修时间和结束检修时间获取手环实时和历史数据
+     * @param name
+     * @param beginDate
+     * @param endDate
+     * @return
+     * @throws Exception
+     */
+
+    public AjaxResult findShbraceletList(String name,String beginDate,String endDate) throws Exception {
+
+        Map<String,Map<String,Object>> result=new HashMap<>();
+
+        if(StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate))
+        {
+            result=recommenService.findShbraceletList(name,beginDate,endDate);
+        }
+
+        if (null!=result) {
+            return AjaxResult.successData(AjaxStatus.success.code, result);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, result);
+        }
+
+    }
+
+
+    /**
+     * 获取部件结构树
+     * @return
+     */
+
+    public AjaxResult findLocationTreeByWtId(String wtId) throws Exception {
+
+        String result="";
+
+        if(StringUtils.notEmp(wtId))
+        {
+
+            result=recommenService.findLocationTreeByWtId(wtId);
+        }
+
+        return AjaxResult.successData(AjaxStatus.success.code, result);
+
+    }
+
+    /**
+     * 通过位置编号获得缺陷单信息
+     * @return
+     */
+
+    public AjaxResult findWobugeqByLocation(Tablepar tablepar, String location) throws Exception {
+
+        PageInfo<Wobugeq> pageInfo=new PageInfo<>();
+
+        if(StringUtils.notEmp(tablepar) && StringUtils.notEmp(location))
+        {
+            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, c.getActualMinimum(Calendar.DAY_OF_MONTH));
+            Date beginDate = DateUtils.truncate(c.getTime());
+            c.set(Calendar.DAY_OF_MONTH, c.getActualMaximum(Calendar.DAY_OF_MONTH));
+            Date endDate = DateUtils.truncate(c.getTime());
+            pageInfo=recommenService.findWobugeqByLocation(tablepar,location, beginDate, endDate);
+        }
+
+        if (null!=pageInfo) {
+            return AjaxResult.successData(AjaxStatus.success.code, pageInfo);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, pageInfo);
+        }
+
+    }
+
+
 }

+ 30 - 0
src/main/java/com/gyee/frame/controller/report/WtHealthReportController.java

@@ -3,8 +3,10 @@ package com.gyee.frame.controller.report;
 import com.gyee.frame.common.base.BaseController;
 import com.gyee.frame.common.conf.AjaxStatus;
 import com.gyee.frame.common.domain.AjaxResult;
+import com.gyee.frame.model.auto.WtReportMain;
 import com.gyee.frame.model.auto.WtTragetReportChart;
 import com.gyee.frame.service.report.WtHealthReportService;
+import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -84,4 +86,32 @@ public class WtHealthReportController extends BaseController {
 
 	}
 
+	/**
+	 * 获得健康报表相关列表信息
+	 * @param wtId
+	 * @param beginDate 必选项
+	 * @param endDate
+	 * @return
+	 * @throws Exception
+	 */
+	@PostMapping("/getReportList")
+	@ResponseBody
+	public AjaxResult getReportList(String wpId,String wtId, String beginDate,String endDate) throws Exception {
+
+		List<WtReportMain> wtrmls=new ArrayList<>();
+
+		if( StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate))
+		{
+
+			wtrmls=wtHealthReportService.getReportList(wpId,wtId, DateUtils.parseDate(beginDate), DateUtils.parseDate(endDate));
+		}
+
+		if (null!=wtrmls) {
+			return AjaxResult.successData(AjaxStatus.success.code, wtrmls);
+		} else {
+			return AjaxResult.successData(AjaxStatus.emptyresultset.code, wtrmls);
+		}
+
+	}
+
 }

+ 100 - 0
src/main/java/com/gyee/frame/mapper/auto/EquipmentSqlMapper.java

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

+ 96 - 0
src/main/java/com/gyee/frame/mapper/auto/MismapSqlMapper.java

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

+ 97 - 0
src/main/java/com/gyee/frame/mapper/auto/ShbrUserMapper.java

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

+ 97 - 0
src/main/java/com/gyee/frame/mapper/auto/ShbraceletPointkeyMapper.java

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

+ 97 - 0
src/main/java/com/gyee/frame/mapper/auto/ShbraceletUserMapper.java

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

+ 97 - 0
src/main/java/com/gyee/frame/mapper/auto/WindturbineSqlMapper.java

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

File diff suppressed because it is too large
+ 1731 - 0
src/main/java/com/gyee/frame/model/auto/EquipmentSql.java


File diff suppressed because it is too large
+ 3774 - 0
src/main/java/com/gyee/frame/model/auto/EquipmentSqlExample.java


+ 79 - 0
src/main/java/com/gyee/frame/model/auto/MismapSql.java

@@ -0,0 +1,79 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+
+public class MismapSql implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column MISMAP.SISKEY
+     *
+     * @mbg.generated
+     */
+    private String siskey;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column MISMAP.MISKEY
+     *
+     * @mbg.generated
+     */
+    private String miskey;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table MISMAP
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column MISMAP.SISKEY
+     *
+     * @return the value of MISMAP.SISKEY
+     *
+     * @mbg.generated
+     */
+    public String getSiskey() {
+        return siskey;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column MISMAP.SISKEY
+     *
+     * @param siskey the value for MISMAP.SISKEY
+     *
+     * @mbg.generated
+     */
+    public void setSiskey(String siskey) {
+        this.siskey = siskey == null ? null : siskey.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column MISMAP.MISKEY
+     *
+     * @return the value of MISMAP.MISKEY
+     *
+     * @mbg.generated
+     */
+    public String getMiskey() {
+        return miskey;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column MISMAP.MISKEY
+     *
+     * @param miskey the value for MISMAP.MISKEY
+     *
+     * @mbg.generated
+     */
+    public void setMiskey(String miskey) {
+        this.miskey = miskey == null ? null : miskey.trim();
+    }
+}

+ 442 - 0
src/main/java/com/gyee/frame/model/auto/MismapSqlExample.java

@@ -0,0 +1,442 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MismapSqlExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table MISMAP
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table MISMAP
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table MISMAP
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table MISMAP
+     *
+     * @mbg.generated
+     */
+    public MismapSqlExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table MISMAP
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table MISMAP
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table MISMAP
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table MISMAP
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table MISMAP
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table MISMAP
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table MISMAP
+     *
+     * @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 MISMAP
+     *
+     * @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 MISMAP
+     *
+     * @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 MISMAP
+     *
+     * @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 MISMAP
+     *
+     * @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 andSiskeyIsNull() {
+            addCriterion("SISKEY is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiskeyIsNotNull() {
+            addCriterion("SISKEY is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiskeyEqualTo(String value) {
+            addCriterion("SISKEY =", value, "siskey");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiskeyNotEqualTo(String value) {
+            addCriterion("SISKEY <>", value, "siskey");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiskeyGreaterThan(String value) {
+            addCriterion("SISKEY >", value, "siskey");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiskeyGreaterThanOrEqualTo(String value) {
+            addCriterion("SISKEY >=", value, "siskey");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiskeyLessThan(String value) {
+            addCriterion("SISKEY <", value, "siskey");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiskeyLessThanOrEqualTo(String value) {
+            addCriterion("SISKEY <=", value, "siskey");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiskeyLike(String value) {
+            addCriterion("SISKEY like", value, "siskey");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiskeyNotLike(String value) {
+            addCriterion("SISKEY not like", value, "siskey");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiskeyIn(List<String> values) {
+            addCriterion("SISKEY in", values, "siskey");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiskeyNotIn(List<String> values) {
+            addCriterion("SISKEY not in", values, "siskey");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiskeyBetween(String value1, String value2) {
+            addCriterion("SISKEY between", value1, value2, "siskey");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiskeyNotBetween(String value1, String value2) {
+            addCriterion("SISKEY not between", value1, value2, "siskey");
+            return (Criteria) this;
+        }
+
+        public Criteria andMiskeyIsNull() {
+            addCriterion("MISKEY is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMiskeyIsNotNull() {
+            addCriterion("MISKEY is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMiskeyEqualTo(String value) {
+            addCriterion("MISKEY =", value, "miskey");
+            return (Criteria) this;
+        }
+
+        public Criteria andMiskeyNotEqualTo(String value) {
+            addCriterion("MISKEY <>", value, "miskey");
+            return (Criteria) this;
+        }
+
+        public Criteria andMiskeyGreaterThan(String value) {
+            addCriterion("MISKEY >", value, "miskey");
+            return (Criteria) this;
+        }
+
+        public Criteria andMiskeyGreaterThanOrEqualTo(String value) {
+            addCriterion("MISKEY >=", value, "miskey");
+            return (Criteria) this;
+        }
+
+        public Criteria andMiskeyLessThan(String value) {
+            addCriterion("MISKEY <", value, "miskey");
+            return (Criteria) this;
+        }
+
+        public Criteria andMiskeyLessThanOrEqualTo(String value) {
+            addCriterion("MISKEY <=", value, "miskey");
+            return (Criteria) this;
+        }
+
+        public Criteria andMiskeyLike(String value) {
+            addCriterion("MISKEY like", value, "miskey");
+            return (Criteria) this;
+        }
+
+        public Criteria andMiskeyNotLike(String value) {
+            addCriterion("MISKEY not like", value, "miskey");
+            return (Criteria) this;
+        }
+
+        public Criteria andMiskeyIn(List<String> values) {
+            addCriterion("MISKEY in", values, "miskey");
+            return (Criteria) this;
+        }
+
+        public Criteria andMiskeyNotIn(List<String> values) {
+            addCriterion("MISKEY not in", values, "miskey");
+            return (Criteria) this;
+        }
+
+        public Criteria andMiskeyBetween(String value1, String value2) {
+            addCriterion("MISKEY between", value1, value2, "miskey");
+            return (Criteria) this;
+        }
+
+        public Criteria andMiskeyNotBetween(String value1, String value2) {
+            addCriterion("MISKEY not between", value1, value2, "miskey");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table MISMAP
+     *
+     * @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 MISMAP
+     *
+     * @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);
+        }
+    }
+}

+ 278 - 0
src/main/java/com/gyee/frame/model/auto/ShbrUser.java

@@ -0,0 +1,278 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class ShbrUser implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column SHBRUSER.ID
+     *
+     * @mbg.generated
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column SHBRUSER.USERNAME
+     *
+     * @mbg.generated
+     */
+    private String username;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column SHBRUSER.MOBILE
+     *
+     * @mbg.generated
+     */
+    private String mobile;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column SHBRUSER.PASSWORD
+     *
+     * @mbg.generated
+     */
+    private String password;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column SHBRUSER.SALT
+     *
+     * @mbg.generated
+     */
+    private String salt;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column SHBRUSER.IMG
+     *
+     * @mbg.generated
+     */
+    private String img;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column SHBRUSER.CREATETIME
+     *
+     * @mbg.generated
+     */
+    private Date createtime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column SHBRUSER.STATIONID
+     *
+     * @mbg.generated
+     */
+    private String stationid;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table SHBRUSER
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column SHBRUSER.ID
+     *
+     * @return the value of SHBRUSER.ID
+     *
+     * @mbg.generated
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column SHBRUSER.ID
+     *
+     * @param id the value for SHBRUSER.ID
+     *
+     * @mbg.generated
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column SHBRUSER.USERNAME
+     *
+     * @return the value of SHBRUSER.USERNAME
+     *
+     * @mbg.generated
+     */
+    public String getUsername() {
+        return username;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column SHBRUSER.USERNAME
+     *
+     * @param username the value for SHBRUSER.USERNAME
+     *
+     * @mbg.generated
+     */
+    public void setUsername(String username) {
+        this.username = username == null ? null : username.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column SHBRUSER.MOBILE
+     *
+     * @return the value of SHBRUSER.MOBILE
+     *
+     * @mbg.generated
+     */
+    public String getMobile() {
+        return mobile;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column SHBRUSER.MOBILE
+     *
+     * @param mobile the value for SHBRUSER.MOBILE
+     *
+     * @mbg.generated
+     */
+    public void setMobile(String mobile) {
+        this.mobile = mobile == null ? null : mobile.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column SHBRUSER.PASSWORD
+     *
+     * @return the value of SHBRUSER.PASSWORD
+     *
+     * @mbg.generated
+     */
+    public String getPassword() {
+        return password;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column SHBRUSER.PASSWORD
+     *
+     * @param password the value for SHBRUSER.PASSWORD
+     *
+     * @mbg.generated
+     */
+    public void setPassword(String password) {
+        this.password = password == null ? null : password.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column SHBRUSER.SALT
+     *
+     * @return the value of SHBRUSER.SALT
+     *
+     * @mbg.generated
+     */
+    public String getSalt() {
+        return salt;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column SHBRUSER.SALT
+     *
+     * @param salt the value for SHBRUSER.SALT
+     *
+     * @mbg.generated
+     */
+    public void setSalt(String salt) {
+        this.salt = salt == null ? null : salt.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column SHBRUSER.IMG
+     *
+     * @return the value of SHBRUSER.IMG
+     *
+     * @mbg.generated
+     */
+    public String getImg() {
+        return img;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column SHBRUSER.IMG
+     *
+     * @param img the value for SHBRUSER.IMG
+     *
+     * @mbg.generated
+     */
+    public void setImg(String img) {
+        this.img = img == null ? null : img.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column SHBRUSER.CREATETIME
+     *
+     * @return the value of SHBRUSER.CREATETIME
+     *
+     * @mbg.generated
+     */
+    public Date getCreatetime() {
+        return createtime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column SHBRUSER.CREATETIME
+     *
+     * @param createtime the value for SHBRUSER.CREATETIME
+     *
+     * @mbg.generated
+     */
+    public void setCreatetime(Date createtime) {
+        this.createtime = createtime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column SHBRUSER.STATIONID
+     *
+     * @return the value of SHBRUSER.STATIONID
+     *
+     * @mbg.generated
+     */
+    public String getStationid() {
+        return stationid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column SHBRUSER.STATIONID
+     *
+     * @param stationid the value for SHBRUSER.STATIONID
+     *
+     * @mbg.generated
+     */
+    public void setStationid(String stationid) {
+        this.stationid = stationid == null ? null : stationid.trim();
+    }
+}

+ 843 - 0
src/main/java/com/gyee/frame/model/auto/ShbrUserExample.java

@@ -0,0 +1,843 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class ShbrUserExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table SHBRUSER
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table SHBRUSER
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table SHBRUSER
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table SHBRUSER
+     *
+     * @mbg.generated
+     */
+    public ShbrUserExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table SHBRUSER
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table SHBRUSER
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table SHBRUSER
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table SHBRUSER
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table SHBRUSER
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table SHBRUSER
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table SHBRUSER
+     *
+     * @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 SHBRUSER
+     *
+     * @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 SHBRUSER
+     *
+     * @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 SHBRUSER
+     *
+     * @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 SHBRUSER
+     *
+     * @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(Integer value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameIsNull() {
+            addCriterion("USERNAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameIsNotNull() {
+            addCriterion("USERNAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameEqualTo(String value) {
+            addCriterion("USERNAME =", value, "username");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameNotEqualTo(String value) {
+            addCriterion("USERNAME <>", value, "username");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameGreaterThan(String value) {
+            addCriterion("USERNAME >", value, "username");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameGreaterThanOrEqualTo(String value) {
+            addCriterion("USERNAME >=", value, "username");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameLessThan(String value) {
+            addCriterion("USERNAME <", value, "username");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameLessThanOrEqualTo(String value) {
+            addCriterion("USERNAME <=", value, "username");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameLike(String value) {
+            addCriterion("USERNAME like", value, "username");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameNotLike(String value) {
+            addCriterion("USERNAME not like", value, "username");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameIn(List<String> values) {
+            addCriterion("USERNAME in", values, "username");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameNotIn(List<String> values) {
+            addCriterion("USERNAME not in", values, "username");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameBetween(String value1, String value2) {
+            addCriterion("USERNAME between", value1, value2, "username");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsernameNotBetween(String value1, String value2) {
+            addCriterion("USERNAME not between", value1, value2, "username");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileIsNull() {
+            addCriterion("MOBILE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileIsNotNull() {
+            addCriterion("MOBILE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileEqualTo(String value) {
+            addCriterion("MOBILE =", value, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileNotEqualTo(String value) {
+            addCriterion("MOBILE <>", value, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileGreaterThan(String value) {
+            addCriterion("MOBILE >", value, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileGreaterThanOrEqualTo(String value) {
+            addCriterion("MOBILE >=", value, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileLessThan(String value) {
+            addCriterion("MOBILE <", value, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileLessThanOrEqualTo(String value) {
+            addCriterion("MOBILE <=", value, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileLike(String value) {
+            addCriterion("MOBILE like", value, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileNotLike(String value) {
+            addCriterion("MOBILE not like", value, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileIn(List<String> values) {
+            addCriterion("MOBILE in", values, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileNotIn(List<String> values) {
+            addCriterion("MOBILE not in", values, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileBetween(String value1, String value2) {
+            addCriterion("MOBILE between", value1, value2, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileNotBetween(String value1, String value2) {
+            addCriterion("MOBILE not between", value1, value2, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordIsNull() {
+            addCriterion("PASSWORD is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordIsNotNull() {
+            addCriterion("PASSWORD is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordEqualTo(String value) {
+            addCriterion("PASSWORD =", value, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordNotEqualTo(String value) {
+            addCriterion("PASSWORD <>", value, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordGreaterThan(String value) {
+            addCriterion("PASSWORD >", value, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordGreaterThanOrEqualTo(String value) {
+            addCriterion("PASSWORD >=", value, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordLessThan(String value) {
+            addCriterion("PASSWORD <", value, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordLessThanOrEqualTo(String value) {
+            addCriterion("PASSWORD <=", value, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordLike(String value) {
+            addCriterion("PASSWORD like", value, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordNotLike(String value) {
+            addCriterion("PASSWORD not like", value, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordIn(List<String> values) {
+            addCriterion("PASSWORD in", values, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordNotIn(List<String> values) {
+            addCriterion("PASSWORD not in", values, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordBetween(String value1, String value2) {
+            addCriterion("PASSWORD between", value1, value2, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andPasswordNotBetween(String value1, String value2) {
+            addCriterion("PASSWORD not between", value1, value2, "password");
+            return (Criteria) this;
+        }
+
+        public Criteria andSaltIsNull() {
+            addCriterion("SALT is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSaltIsNotNull() {
+            addCriterion("SALT is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSaltEqualTo(String value) {
+            addCriterion("SALT =", value, "salt");
+            return (Criteria) this;
+        }
+
+        public Criteria andSaltNotEqualTo(String value) {
+            addCriterion("SALT <>", value, "salt");
+            return (Criteria) this;
+        }
+
+        public Criteria andSaltGreaterThan(String value) {
+            addCriterion("SALT >", value, "salt");
+            return (Criteria) this;
+        }
+
+        public Criteria andSaltGreaterThanOrEqualTo(String value) {
+            addCriterion("SALT >=", value, "salt");
+            return (Criteria) this;
+        }
+
+        public Criteria andSaltLessThan(String value) {
+            addCriterion("SALT <", value, "salt");
+            return (Criteria) this;
+        }
+
+        public Criteria andSaltLessThanOrEqualTo(String value) {
+            addCriterion("SALT <=", value, "salt");
+            return (Criteria) this;
+        }
+
+        public Criteria andSaltLike(String value) {
+            addCriterion("SALT like", value, "salt");
+            return (Criteria) this;
+        }
+
+        public Criteria andSaltNotLike(String value) {
+            addCriterion("SALT not like", value, "salt");
+            return (Criteria) this;
+        }
+
+        public Criteria andSaltIn(List<String> values) {
+            addCriterion("SALT in", values, "salt");
+            return (Criteria) this;
+        }
+
+        public Criteria andSaltNotIn(List<String> values) {
+            addCriterion("SALT not in", values, "salt");
+            return (Criteria) this;
+        }
+
+        public Criteria andSaltBetween(String value1, String value2) {
+            addCriterion("SALT between", value1, value2, "salt");
+            return (Criteria) this;
+        }
+
+        public Criteria andSaltNotBetween(String value1, String value2) {
+            addCriterion("SALT not between", value1, value2, "salt");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgIsNull() {
+            addCriterion("IMG is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgIsNotNull() {
+            addCriterion("IMG is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgEqualTo(String value) {
+            addCriterion("IMG =", value, "img");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgNotEqualTo(String value) {
+            addCriterion("IMG <>", value, "img");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgGreaterThan(String value) {
+            addCriterion("IMG >", value, "img");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgGreaterThanOrEqualTo(String value) {
+            addCriterion("IMG >=", value, "img");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgLessThan(String value) {
+            addCriterion("IMG <", value, "img");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgLessThanOrEqualTo(String value) {
+            addCriterion("IMG <=", value, "img");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgLike(String value) {
+            addCriterion("IMG like", value, "img");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgNotLike(String value) {
+            addCriterion("IMG not like", value, "img");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgIn(List<String> values) {
+            addCriterion("IMG in", values, "img");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgNotIn(List<String> values) {
+            addCriterion("IMG not in", values, "img");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgBetween(String value1, String value2) {
+            addCriterion("IMG between", value1, value2, "img");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgNotBetween(String value1, String value2) {
+            addCriterion("IMG not between", value1, value2, "img");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeIsNull() {
+            addCriterion("CREATETIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeIsNotNull() {
+            addCriterion("CREATETIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeEqualTo(Date value) {
+            addCriterion("CREATETIME =", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeNotEqualTo(Date value) {
+            addCriterion("CREATETIME <>", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeGreaterThan(Date value) {
+            addCriterion("CREATETIME >", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("CREATETIME >=", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeLessThan(Date value) {
+            addCriterion("CREATETIME <", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeLessThanOrEqualTo(Date value) {
+            addCriterion("CREATETIME <=", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeIn(List<Date> values) {
+            addCriterion("CREATETIME in", values, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeNotIn(List<Date> values) {
+            addCriterion("CREATETIME not in", values, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeBetween(Date value1, Date value2) {
+            addCriterion("CREATETIME between", value1, value2, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeNotBetween(Date value1, Date value2) {
+            addCriterion("CREATETIME not between", value1, value2, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStationidIsNull() {
+            addCriterion("STATIONID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStationidIsNotNull() {
+            addCriterion("STATIONID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStationidEqualTo(String value) {
+            addCriterion("STATIONID =", value, "stationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andStationidNotEqualTo(String value) {
+            addCriterion("STATIONID <>", value, "stationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andStationidGreaterThan(String value) {
+            addCriterion("STATIONID >", value, "stationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andStationidGreaterThanOrEqualTo(String value) {
+            addCriterion("STATIONID >=", value, "stationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andStationidLessThan(String value) {
+            addCriterion("STATIONID <", value, "stationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andStationidLessThanOrEqualTo(String value) {
+            addCriterion("STATIONID <=", value, "stationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andStationidLike(String value) {
+            addCriterion("STATIONID like", value, "stationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andStationidNotLike(String value) {
+            addCriterion("STATIONID not like", value, "stationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andStationidIn(List<String> values) {
+            addCriterion("STATIONID in", values, "stationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andStationidNotIn(List<String> values) {
+            addCriterion("STATIONID not in", values, "stationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andStationidBetween(String value1, String value2) {
+            addCriterion("STATIONID between", value1, value2, "stationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andStationidNotBetween(String value1, String value2) {
+            addCriterion("STATIONID not between", value1, value2, "stationid");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table SHBRUSER
+     *
+     * @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 SHBRUSER
+     *
+     * @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);
+        }
+    }
+}

+ 146 - 0
src/main/java/com/gyee/frame/model/auto/ShbraceletPointkey.java

@@ -0,0 +1,146 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class ShbraceletPointkey implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column SHBRACELETPOINTKEY.ID
+     *
+     * @mbg.generated
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column SHBRACELETPOINTKEY.POINTKEY
+     *
+     * @mbg.generated
+     */
+    private String pointkey;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column SHBRACELETPOINTKEY.DEVICEID
+     *
+     * @mbg.generated
+     */
+    private Integer deviceid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column SHBRACELETPOINTKEY.CREATETIME
+     *
+     * @mbg.generated
+     */
+    private Date createtime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table SHBRACELETPOINTKEY
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column SHBRACELETPOINTKEY.ID
+     *
+     * @return the value of SHBRACELETPOINTKEY.ID
+     *
+     * @mbg.generated
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column SHBRACELETPOINTKEY.ID
+     *
+     * @param id the value for SHBRACELETPOINTKEY.ID
+     *
+     * @mbg.generated
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column SHBRACELETPOINTKEY.POINTKEY
+     *
+     * @return the value of SHBRACELETPOINTKEY.POINTKEY
+     *
+     * @mbg.generated
+     */
+    public String getPointkey() {
+        return pointkey;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column SHBRACELETPOINTKEY.POINTKEY
+     *
+     * @param pointkey the value for SHBRACELETPOINTKEY.POINTKEY
+     *
+     * @mbg.generated
+     */
+    public void setPointkey(String pointkey) {
+        this.pointkey = pointkey == null ? null : pointkey.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column SHBRACELETPOINTKEY.DEVICEID
+     *
+     * @return the value of SHBRACELETPOINTKEY.DEVICEID
+     *
+     * @mbg.generated
+     */
+    public Integer getDeviceid() {
+        return deviceid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column SHBRACELETPOINTKEY.DEVICEID
+     *
+     * @param deviceid the value for SHBRACELETPOINTKEY.DEVICEID
+     *
+     * @mbg.generated
+     */
+    public void setDeviceid(Integer deviceid) {
+        this.deviceid = deviceid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column SHBRACELETPOINTKEY.CREATETIME
+     *
+     * @return the value of SHBRACELETPOINTKEY.CREATETIME
+     *
+     * @mbg.generated
+     */
+    public Date getCreatetime() {
+        return createtime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column SHBRACELETPOINTKEY.CREATETIME
+     *
+     * @param createtime the value for SHBRACELETPOINTKEY.CREATETIME
+     *
+     * @mbg.generated
+     */
+    public void setCreatetime(Date createtime) {
+        this.createtime = createtime;
+    }
+}

+ 553 - 0
src/main/java/com/gyee/frame/model/auto/ShbraceletPointkeyExample.java

@@ -0,0 +1,553 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class ShbraceletPointkeyExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table SHBRACELETPOINTKEY
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table SHBRACELETPOINTKEY
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table SHBRACELETPOINTKEY
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table SHBRACELETPOINTKEY
+     *
+     * @mbg.generated
+     */
+    public ShbraceletPointkeyExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table SHBRACELETPOINTKEY
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table SHBRACELETPOINTKEY
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table SHBRACELETPOINTKEY
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table SHBRACELETPOINTKEY
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table SHBRACELETPOINTKEY
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table SHBRACELETPOINTKEY
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table SHBRACELETPOINTKEY
+     *
+     * @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 SHBRACELETPOINTKEY
+     *
+     * @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 SHBRACELETPOINTKEY
+     *
+     * @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 SHBRACELETPOINTKEY
+     *
+     * @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 SHBRACELETPOINTKEY
+     *
+     * @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(Integer value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointkeyIsNull() {
+            addCriterion("POINTKEY is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointkeyIsNotNull() {
+            addCriterion("POINTKEY is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointkeyEqualTo(String value) {
+            addCriterion("POINTKEY =", value, "pointkey");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointkeyNotEqualTo(String value) {
+            addCriterion("POINTKEY <>", value, "pointkey");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointkeyGreaterThan(String value) {
+            addCriterion("POINTKEY >", value, "pointkey");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointkeyGreaterThanOrEqualTo(String value) {
+            addCriterion("POINTKEY >=", value, "pointkey");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointkeyLessThan(String value) {
+            addCriterion("POINTKEY <", value, "pointkey");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointkeyLessThanOrEqualTo(String value) {
+            addCriterion("POINTKEY <=", value, "pointkey");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointkeyLike(String value) {
+            addCriterion("POINTKEY like", value, "pointkey");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointkeyNotLike(String value) {
+            addCriterion("POINTKEY not like", value, "pointkey");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointkeyIn(List<String> values) {
+            addCriterion("POINTKEY in", values, "pointkey");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointkeyNotIn(List<String> values) {
+            addCriterion("POINTKEY not in", values, "pointkey");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointkeyBetween(String value1, String value2) {
+            addCriterion("POINTKEY between", value1, value2, "pointkey");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointkeyNotBetween(String value1, String value2) {
+            addCriterion("POINTKEY not between", value1, value2, "pointkey");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceidIsNull() {
+            addCriterion("DEVICEID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceidIsNotNull() {
+            addCriterion("DEVICEID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceidEqualTo(Integer value) {
+            addCriterion("DEVICEID =", value, "deviceid");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceidNotEqualTo(Integer value) {
+            addCriterion("DEVICEID <>", value, "deviceid");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceidGreaterThan(Integer value) {
+            addCriterion("DEVICEID >", value, "deviceid");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceidGreaterThanOrEqualTo(Integer value) {
+            addCriterion("DEVICEID >=", value, "deviceid");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceidLessThan(Integer value) {
+            addCriterion("DEVICEID <", value, "deviceid");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceidLessThanOrEqualTo(Integer value) {
+            addCriterion("DEVICEID <=", value, "deviceid");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceidIn(List<Integer> values) {
+            addCriterion("DEVICEID in", values, "deviceid");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceidNotIn(List<Integer> values) {
+            addCriterion("DEVICEID not in", values, "deviceid");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceidBetween(Integer value1, Integer value2) {
+            addCriterion("DEVICEID between", value1, value2, "deviceid");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceidNotBetween(Integer value1, Integer value2) {
+            addCriterion("DEVICEID not between", value1, value2, "deviceid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeIsNull() {
+            addCriterion("CREATETIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeIsNotNull() {
+            addCriterion("CREATETIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeEqualTo(Date value) {
+            addCriterion("CREATETIME =", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeNotEqualTo(Date value) {
+            addCriterion("CREATETIME <>", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeGreaterThan(Date value) {
+            addCriterion("CREATETIME >", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("CREATETIME >=", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeLessThan(Date value) {
+            addCriterion("CREATETIME <", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeLessThanOrEqualTo(Date value) {
+            addCriterion("CREATETIME <=", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeIn(List<Date> values) {
+            addCriterion("CREATETIME in", values, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeNotIn(List<Date> values) {
+            addCriterion("CREATETIME not in", values, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeBetween(Date value1, Date value2) {
+            addCriterion("CREATETIME between", value1, value2, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeNotBetween(Date value1, Date value2) {
+            addCriterion("CREATETIME not between", value1, value2, "createtime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table SHBRACELETPOINTKEY
+     *
+     * @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 SHBRACELETPOINTKEY
+     *
+     * @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);
+        }
+    }
+}

+ 146 - 0
src/main/java/com/gyee/frame/model/auto/ShbraceletUser.java

@@ -0,0 +1,146 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class ShbraceletUser implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column SHBRACELETUSER.ID
+     *
+     * @mbg.generated
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column SHBRACELETUSER.DEVICEID
+     *
+     * @mbg.generated
+     */
+    private Integer deviceid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column SHBRACELETUSER.USERID
+     *
+     * @mbg.generated
+     */
+    private Integer userid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column SHBRACELETUSER.CREATETIME
+     *
+     * @mbg.generated
+     */
+    private Date createtime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table SHBRACELETUSER
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column SHBRACELETUSER.ID
+     *
+     * @return the value of SHBRACELETUSER.ID
+     *
+     * @mbg.generated
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column SHBRACELETUSER.ID
+     *
+     * @param id the value for SHBRACELETUSER.ID
+     *
+     * @mbg.generated
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column SHBRACELETUSER.DEVICEID
+     *
+     * @return the value of SHBRACELETUSER.DEVICEID
+     *
+     * @mbg.generated
+     */
+    public Integer getDeviceid() {
+        return deviceid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column SHBRACELETUSER.DEVICEID
+     *
+     * @param deviceid the value for SHBRACELETUSER.DEVICEID
+     *
+     * @mbg.generated
+     */
+    public void setDeviceid(Integer deviceid) {
+        this.deviceid = deviceid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column SHBRACELETUSER.USERID
+     *
+     * @return the value of SHBRACELETUSER.USERID
+     *
+     * @mbg.generated
+     */
+    public Integer getUserid() {
+        return userid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column SHBRACELETUSER.USERID
+     *
+     * @param userid the value for SHBRACELETUSER.USERID
+     *
+     * @mbg.generated
+     */
+    public void setUserid(Integer userid) {
+        this.userid = userid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column SHBRACELETUSER.CREATETIME
+     *
+     * @return the value of SHBRACELETUSER.CREATETIME
+     *
+     * @mbg.generated
+     */
+    public Date getCreatetime() {
+        return createtime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column SHBRACELETUSER.CREATETIME
+     *
+     * @param createtime the value for SHBRACELETUSER.CREATETIME
+     *
+     * @mbg.generated
+     */
+    public void setCreatetime(Date createtime) {
+        this.createtime = createtime;
+    }
+}

+ 543 - 0
src/main/java/com/gyee/frame/model/auto/ShbraceletUserExample.java

@@ -0,0 +1,543 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class ShbraceletUserExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table SHBRACELETUSER
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table SHBRACELETUSER
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table SHBRACELETUSER
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table SHBRACELETUSER
+     *
+     * @mbg.generated
+     */
+    public ShbraceletUserExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table SHBRACELETUSER
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table SHBRACELETUSER
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table SHBRACELETUSER
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table SHBRACELETUSER
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table SHBRACELETUSER
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table SHBRACELETUSER
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table SHBRACELETUSER
+     *
+     * @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 SHBRACELETUSER
+     *
+     * @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 SHBRACELETUSER
+     *
+     * @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 SHBRACELETUSER
+     *
+     * @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 SHBRACELETUSER
+     *
+     * @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(Integer value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceidIsNull() {
+            addCriterion("DEVICEID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceidIsNotNull() {
+            addCriterion("DEVICEID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceidEqualTo(Integer value) {
+            addCriterion("DEVICEID =", value, "deviceid");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceidNotEqualTo(Integer value) {
+            addCriterion("DEVICEID <>", value, "deviceid");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceidGreaterThan(Integer value) {
+            addCriterion("DEVICEID >", value, "deviceid");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceidGreaterThanOrEqualTo(Integer value) {
+            addCriterion("DEVICEID >=", value, "deviceid");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceidLessThan(Integer value) {
+            addCriterion("DEVICEID <", value, "deviceid");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceidLessThanOrEqualTo(Integer value) {
+            addCriterion("DEVICEID <=", value, "deviceid");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceidIn(List<Integer> values) {
+            addCriterion("DEVICEID in", values, "deviceid");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceidNotIn(List<Integer> values) {
+            addCriterion("DEVICEID not in", values, "deviceid");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceidBetween(Integer value1, Integer value2) {
+            addCriterion("DEVICEID between", value1, value2, "deviceid");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceidNotBetween(Integer value1, Integer value2) {
+            addCriterion("DEVICEID not between", value1, value2, "deviceid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseridIsNull() {
+            addCriterion("USERID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseridIsNotNull() {
+            addCriterion("USERID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseridEqualTo(Integer value) {
+            addCriterion("USERID =", value, "userid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseridNotEqualTo(Integer value) {
+            addCriterion("USERID <>", value, "userid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseridGreaterThan(Integer value) {
+            addCriterion("USERID >", value, "userid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseridGreaterThanOrEqualTo(Integer value) {
+            addCriterion("USERID >=", value, "userid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseridLessThan(Integer value) {
+            addCriterion("USERID <", value, "userid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseridLessThanOrEqualTo(Integer value) {
+            addCriterion("USERID <=", value, "userid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseridIn(List<Integer> values) {
+            addCriterion("USERID in", values, "userid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseridNotIn(List<Integer> values) {
+            addCriterion("USERID not in", values, "userid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseridBetween(Integer value1, Integer value2) {
+            addCriterion("USERID between", value1, value2, "userid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUseridNotBetween(Integer value1, Integer value2) {
+            addCriterion("USERID not between", value1, value2, "userid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeIsNull() {
+            addCriterion("CREATETIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeIsNotNull() {
+            addCriterion("CREATETIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeEqualTo(Date value) {
+            addCriterion("CREATETIME =", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeNotEqualTo(Date value) {
+            addCriterion("CREATETIME <>", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeGreaterThan(Date value) {
+            addCriterion("CREATETIME >", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("CREATETIME >=", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeLessThan(Date value) {
+            addCriterion("CREATETIME <", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeLessThanOrEqualTo(Date value) {
+            addCriterion("CREATETIME <=", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeIn(List<Date> values) {
+            addCriterion("CREATETIME in", values, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeNotIn(List<Date> values) {
+            addCriterion("CREATETIME not in", values, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeBetween(Date value1, Date value2) {
+            addCriterion("CREATETIME between", value1, value2, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeNotBetween(Date value1, Date value2) {
+            addCriterion("CREATETIME not between", value1, value2, "createtime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table SHBRACELETUSER
+     *
+     * @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 SHBRACELETUSER
+     *
+     * @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);
+        }
+    }
+}

File diff suppressed because it is too large
+ 1004 - 0
src/main/java/com/gyee/frame/model/auto/WindturbineSql.java


File diff suppressed because it is too large
+ 2173 - 0
src/main/java/com/gyee/frame/model/auto/WindturbineSqlExample.java


+ 12 - 0
src/main/java/com/gyee/frame/model/custom/MainTrackVo.java

@@ -38,6 +38,7 @@ public class MainTrackVo implements Serializable {
 	private Date prodtdepttime;// 消缺通知时间
 	private String checkdeptopinion;// 验收意见
 
+
 	private Double rwfpsc;
 	private Double rwfppjsc;
 	private Double ddxcsc;
@@ -47,6 +48,17 @@ public class MainTrackVo implements Serializable {
 	private Double yssc;
 	private Double yspjsc;
 
+
+	private Double workHours;
+
+	public Double getWorkHours() {
+		return workHours;
+	}
+
+	public void setWorkHours(Double workHours) {
+		this.workHours = workHours;
+	}
+
 	public String getCheckdeptopinion() {
 		return checkdeptopinion;
 	}

+ 111 - 0
src/main/java/com/gyee/frame/model/custom/ZtreeNode.java

@@ -0,0 +1,111 @@
+package com.gyee.frame.model.custom;
+
+import java.util.List;
+
+public class ZtreeNode {
+	
+	private String id;
+	private Integer state;
+	private String pid;
+	private String icon;
+	private String iconClose;
+	private String iconOpen;
+	private String name;
+	private Boolean open;
+	private Boolean isParent;
+	private Boolean collapse;
+	private String title;
+	private Boolean click;
+	private String url;
+	private List<ZtreeNode> children;
+	
+	
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
+	
+
+	public List<ZtreeNode> getChildren() {
+		return children;
+	}
+	public void setChildren(List<ZtreeNode> children) {
+		this.children = children;
+	}
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public Integer getState() {
+		return state;
+	}
+	public void setState(Integer state) {
+		this.state = state;
+	}
+	public String getPid() {
+		return pid;
+	}
+	public void setPid(String pid) {
+		this.pid = pid;
+	}
+	public String getIcon() {
+		return icon;
+	}
+	public void setIcon(String icon) {
+		this.icon = icon;
+	}
+	public String getIconClose() {
+		return iconClose;
+	}
+	public void setIconClose(String iconClose) {
+		this.iconClose = iconClose;
+	}
+	public String getIconOpen() {
+		return iconOpen;
+	}
+	public void setIconOpen(String iconOpen) {
+		this.iconOpen = iconOpen;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public Boolean getOpen() {
+		return open;
+	}
+	public void setOpen(Boolean open) {
+		this.open = open;
+	}
+	public Boolean getIsParent() {
+		return isParent;
+	}
+	public void setIsParent(Boolean isParent) {
+		this.isParent = isParent;
+	}
+	public Boolean getCollapse() {
+		return collapse;
+	}
+	public void setCollapse(Boolean collapse) {
+		this.collapse = collapse;
+	}
+	public String getTitle() {
+		return title;
+	}
+	public void setTitle(String title) {
+		this.title = title;
+	}
+	public Boolean getClick() {
+		return click;
+	}
+	public void setClick(Boolean click) {
+		this.click = click;
+	}
+
+	
+}

+ 117 - 0
src/main/java/com/gyee/frame/service/EquipmentSqlService.java

@@ -0,0 +1,117 @@
+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.EquipmentSqlMapper;
+import com.gyee.frame.model.auto.EquipmentSql;
+import com.gyee.frame.model.auto.EquipmentSqlExample;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 线路 EquipmentSqlService
+ * @Title: EquipmentSqlService.java 
+ * @Package com.gyee.frame.service 
+ * @author gyee_自动生成
+ * @email 1@qq.com
+ * @date 2019-12-31 14:58:09  
+ **/
+@Service
+public class EquipmentSqlService implements BaseService<EquipmentSql, EquipmentSqlExample> {
+	@Autowired
+	private EquipmentSqlMapper equipmentSqlMapper;
+
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<Double> lista=Convert.toDoubleArrayList(ids);
+			EquipmentSqlExample example=new EquipmentSqlExample();
+			example.createCriteria().andIdIn(lista);
+			return equipmentSqlMapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public EquipmentSql selectByPrimaryKey(String id) {
+				
+			return equipmentSqlMapper.selectByPrimaryKey(Double.valueOf(id));
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(EquipmentSql record) {
+		return equipmentSqlMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(EquipmentSql record) {
+				
+
+			
+				
+		return equipmentSqlMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(EquipmentSql record, EquipmentSqlExample example) {
+		
+		return equipmentSqlMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(EquipmentSql record, EquipmentSqlExample example) {
+		
+		return equipmentSqlMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<EquipmentSql> selectByExample(EquipmentSqlExample example) {
+		
+		return equipmentSqlMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(EquipmentSqlExample example) {
+		
+		return equipmentSqlMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(EquipmentSqlExample example) {
+		
+		return equipmentSqlMapper.deleteByExample(example);
+	}
+
+	@DataSource(value = DataSourceType.TICKET)
+	public List<EquipmentSql>  getEquipmentListByLocation(String location) {
+
+		List<EquipmentSql> vos=new ArrayList<>();
+
+		if(StringUtils.notEmp(location) )
+		{
+			vos= equipmentSqlMapper.getEquipmentListByLocation(location);
+		}
+
+		return vos;
+
+	}
+
+}

+ 118 - 0
src/main/java/com/gyee/frame/service/MismapSqlService.java

@@ -0,0 +1,118 @@
+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.MismapSqlMapper;
+import com.gyee.frame.model.auto.MismapSql;
+import com.gyee.frame.model.auto.MismapSqlExample;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@Service
+public class MismapSqlService implements BaseService<MismapSql, MismapSqlExample> {
+	@Autowired
+	private MismapSqlMapper mismapSqlMapper;
+	
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+
+			List<String> lista=Convert.toListStrArray(ids);
+			MismapSqlExample example=new MismapSqlExample();
+			example.createCriteria().andSiskeyIn(lista);
+			return mismapSqlMapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public MismapSql selectByPrimaryKey(String id) {
+				
+			return mismapSqlMapper.selectByPrimaryKey(id);
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(MismapSql record) {
+		return mismapSqlMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(MismapSql record) {
+				
+
+				
+		return mismapSqlMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(MismapSql record, MismapSqlExample example) {
+		
+		return mismapSqlMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(MismapSql record, MismapSqlExample example) {
+		
+		return mismapSqlMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<MismapSql> selectByExample(MismapSqlExample example) {
+		
+		return mismapSqlMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(MismapSqlExample example) {
+		
+		return mismapSqlMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(MismapSqlExample example) {
+		
+		return mismapSqlMapper.deleteByExample(example);
+	}
+
+	public MismapSql findMismapSqlById(String wtnum) {
+
+
+		MismapSql po=new MismapSql();
+
+		if(StringUtils.notEmp(wtnum) )
+		{
+			MismapSqlExample example=new MismapSqlExample();
+
+			MismapSqlExample.Criteria criteria =example.createCriteria();
+
+			criteria.andSiskeyEqualTo(wtnum);
+
+			List<MismapSql> list= mismapSqlMapper.selectByExample(example);
+
+			if(!list.isEmpty())
+			{
+				po=list.get(0);
+
+			}
+
+		}
+
+		return po;
+
+	}
+}

+ 3 - 0
src/main/java/com/gyee/frame/service/RecommenmainService.java

@@ -162,4 +162,7 @@ public class RecommenmainService implements BaseService<Recommenmain, Recommenma
 		return po;
 
 	}
+
+
+
 }

+ 113 - 0
src/main/java/com/gyee/frame/service/ShbrUserService.java

@@ -0,0 +1,113 @@
+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.ShbrUserMapper;
+import com.gyee.frame.model.auto.ShbrUser;
+import com.gyee.frame.model.auto.ShbrUserExample;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@Service
+public class ShbrUserService implements BaseService<ShbrUser, ShbrUserExample> {
+	@Autowired
+	private ShbrUserMapper shbrUserMapper;
+	
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<Integer> lista=Convert.toIntArrayList(ids);
+			ShbrUserExample example=new ShbrUserExample();
+			example.createCriteria().andIdIn(lista);
+			return shbrUserMapper.deleteByExample(example);
+			
+				
+	}
+	
+
+	@Override
+	public ShbrUser selectByPrimaryKey(String id) {
+
+			return shbrUserMapper.selectByPrimaryKey(Integer.valueOf(id));
+
+	}
+
+
+	@Override
+	public int updateByPrimaryKeySelective(ShbrUser record) {
+		return shbrUserMapper.updateByPrimaryKeySelective(record);
+	}
+
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(ShbrUser record) {
+
+		return shbrUserMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(ShbrUser record, ShbrUserExample example) {
+		
+		return shbrUserMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(ShbrUser record, ShbrUserExample example) {
+		
+		return shbrUserMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<ShbrUser> selectByExample(ShbrUserExample example) {
+		
+		return shbrUserMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(ShbrUserExample example) {
+		
+		return shbrUserMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(ShbrUserExample example) {
+		
+		return shbrUserMapper.deleteByExample(example);
+	}
+
+	//通过用户名称获得用户信息
+	public ShbrUser findShbrUserByName(String name) {
+
+		ShbrUser po=new ShbrUser();
+
+		if(StringUtils.notEmp(name))
+		{
+			ShbrUserExample example=new ShbrUserExample();
+
+			ShbrUserExample.Criteria criteria =example.createCriteria();
+
+			criteria.andUsernameEqualTo(name);
+			List<ShbrUser>  list= shbrUserMapper.selectByExample(example);
+
+			if(!list.isEmpty())
+			{
+				po=list.get(0);
+			}
+		}
+
+		return po;
+
+	}
+}

+ 112 - 0
src/main/java/com/gyee/frame/service/ShbraceletPointkeyService.java

@@ -0,0 +1,112 @@
+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.ShbraceletPointkeyMapper;
+import com.gyee.frame.model.auto.ShbraceletPointkey;
+import com.gyee.frame.model.auto.ShbraceletPointkeyExample;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+@Service
+public class ShbraceletPointkeyService implements BaseService<ShbraceletPointkey, ShbraceletPointkeyExample> {
+	@Autowired
+	private ShbraceletPointkeyMapper shbraceletPointkeyMapper;
+	
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<Integer> lista=Convert.toIntArrayList(ids);
+			ShbraceletPointkeyExample example=new ShbraceletPointkeyExample();
+			example.createCriteria().andIdIn(lista);
+			return shbraceletPointkeyMapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public ShbraceletPointkey selectByPrimaryKey(String id) {
+				
+			return shbraceletPointkeyMapper.selectByPrimaryKey(Integer.valueOf(id));
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(ShbraceletPointkey record) {
+		return shbraceletPointkeyMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(ShbraceletPointkey record) {
+				
+
+				
+		return shbraceletPointkeyMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(ShbraceletPointkey record, ShbraceletPointkeyExample example) {
+		
+		return shbraceletPointkeyMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(ShbraceletPointkey record, ShbraceletPointkeyExample example) {
+		
+		return shbraceletPointkeyMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<ShbraceletPointkey> selectByExample(ShbraceletPointkeyExample example) {
+		
+		return shbraceletPointkeyMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(ShbraceletPointkeyExample example) {
+		
+		return shbraceletPointkeyMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(ShbraceletPointkeyExample example) {
+		
+		return shbraceletPointkeyMapper.deleteByExample(example);
+	}
+
+	//通过设备编号获得相应测点信息
+	public List<ShbraceletPointkey> findShbraceletPointkeyList(int deviceId) {
+
+		List<ShbraceletPointkey>  list=new ArrayList<>();
+
+		if(StringUtils.notEmp(deviceId))
+		{
+			ShbraceletPointkeyExample example=new ShbraceletPointkeyExample();
+
+			ShbraceletPointkeyExample.Criteria criteria =example.createCriteria();
+
+			criteria.andDeviceidEqualTo(deviceId);
+			list= shbraceletPointkeyMapper.selectByExample(example);
+
+		}
+
+		return list;
+
+	}
+}

+ 116 - 0
src/main/java/com/gyee/frame/service/ShbraceletUserService.java

@@ -0,0 +1,116 @@
+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.ShbraceletUserMapper;
+import com.gyee.frame.model.auto.ShbraceletUser;
+import com.gyee.frame.model.auto.ShbraceletUserExample;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@Service
+public class ShbraceletUserService implements BaseService<ShbraceletUser, ShbraceletUserExample> {
+	@Autowired
+	private ShbraceletUserMapper shbraceletUserMapper;
+	
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<Integer> lista=Convert.toIntArrayList(ids);
+			ShbraceletUserExample example=new ShbraceletUserExample();
+			example.createCriteria().andIdIn(lista);
+			return shbraceletUserMapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public ShbraceletUser selectByPrimaryKey(String id) {
+				
+			return shbraceletUserMapper.selectByPrimaryKey(Integer.valueOf(id));
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(ShbraceletUser record) {
+		return shbraceletUserMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(ShbraceletUser record) {
+				
+
+				
+		return shbraceletUserMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(ShbraceletUser record, ShbraceletUserExample example) {
+		
+		return shbraceletUserMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(ShbraceletUser record, ShbraceletUserExample example) {
+		
+		return shbraceletUserMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<ShbraceletUser> selectByExample(ShbraceletUserExample example) {
+		
+		return shbraceletUserMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(ShbraceletUserExample example) {
+		
+		return shbraceletUserMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(ShbraceletUserExample example) {
+		
+		return shbraceletUserMapper.deleteByExample(example);
+	}
+
+
+	//通过用户名称获得相应手环设备信息
+	public ShbraceletUser findShbraceletUserById(int userId) {
+
+		ShbraceletUser po=new ShbraceletUser();
+
+		if(StringUtils.notEmp(userId))
+		{
+			ShbraceletUserExample example=new ShbraceletUserExample();
+
+			ShbraceletUserExample.Criteria criteria =example.createCriteria();
+
+			criteria.andUseridEqualTo(userId);
+			List<ShbraceletUser>  list= shbraceletUserMapper.selectByExample(example);
+
+			if(!list.isEmpty())
+			{
+				po=list.get(0);
+			}
+		}
+
+		return po;
+
+	}
+}

+ 122 - 0
src/main/java/com/gyee/frame/service/WindturbineSqlService.java

@@ -0,0 +1,122 @@
+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.WindturbineSqlMapper;
+import com.gyee.frame.model.auto.WindturbineSql;
+import com.gyee.frame.model.auto.WindturbineSqlExample;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@Service
+public class WindturbineSqlService implements BaseService<WindturbineSql, WindturbineSqlExample> {
+	@Autowired
+	private WindturbineSqlMapper windturbineSqlMapper;
+	
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<Double> lista=Convert.toDoubleArrayList(ids);
+			WindturbineSqlExample example=new WindturbineSqlExample();
+			example.createCriteria().andIdIn(lista);
+			return windturbineSqlMapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public WindturbineSql selectByPrimaryKey(String id) {
+				
+			return windturbineSqlMapper.selectByPrimaryKey(Double.valueOf(id));
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(WindturbineSql record) {
+		return windturbineSqlMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(WindturbineSql record) {
+				
+			
+				
+		return windturbineSqlMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(WindturbineSql record, WindturbineSqlExample example) {
+		
+		return windturbineSqlMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(WindturbineSql record, WindturbineSqlExample example) {
+		
+		return windturbineSqlMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<WindturbineSql> selectByExample(WindturbineSqlExample example) {
+		
+		return windturbineSqlMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(WindturbineSqlExample example) {
+		
+		return windturbineSqlMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(WindturbineSqlExample example) {
+		
+		return windturbineSqlMapper.deleteByExample(example);
+	}
+
+	@DataSource(value = DataSourceType.TICKET)
+	public WindturbineSql findWindturbineById(String wtnum) {
+
+
+		WindturbineSql po=new WindturbineSql();
+
+		if(StringUtils.notEmp(wtnum) )
+		{
+			WindturbineSqlExample example=new WindturbineSqlExample();
+
+
+			WindturbineSqlExample.Criteria criteria =example.createCriteria();
+
+			criteria.andWtnumEqualTo(Double.valueOf(wtnum));
+
+			List<WindturbineSql> list= windturbineSqlMapper.selectByExample(example);
+
+			if(!list.isEmpty())
+			{
+				po=list.get(0);
+
+			}
+
+		}
+
+		return po;
+
+	}
+}

+ 49 - 0
src/main/java/com/gyee/frame/service/WobugeqService.java

@@ -1,5 +1,7 @@
 package com.gyee.frame.service;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.gyee.frame.common.base.BaseService;
 import com.gyee.frame.common.dataSources.DataSource;
 import com.gyee.frame.common.dataSources.DataSourceType;
@@ -8,6 +10,7 @@ import com.gyee.frame.mapper.auto.WobugeqMapper;
 import com.gyee.frame.model.auto.Wobugeq;
 import com.gyee.frame.model.auto.WobugeqExample;
 import com.gyee.frame.model.custom.MainTrackVo;
+import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -178,4 +181,50 @@ public class WobugeqService implements BaseService<Wobugeq, WobugeqExample> {
 
 	}
 
+
+
+
+	@DataSource(value = DataSourceType.TICKET)
+	public PageInfo<Wobugeq> findWobugeqByLocation(Tablepar tablepar,String location, Date beginDate, Date endDate) {
+
+
+		PageInfo<Wobugeq> pageInfo=new PageInfo<>();
+
+		if(StringUtils.notEmp(location) )
+		{
+			WobugeqExample example=new WobugeqExample();
+
+			WobugeqExample.Criteria criteria =example.createCriteria();
+
+			criteria.andLocationEqualTo(location);
+
+			criteria.andFindtimeGreaterThanOrEqualTo(beginDate).andFindtimeLessThan(endDate);
+
+
+			if(StringUtils.isNotEmpty(tablepar.getOrderByColumn()))
+			{
+				StringBuilder sb=new StringBuilder();
+				sb.append(" ").append(tablepar.getOrderByColumn());
+				if(StringUtils.isNotEmpty(tablepar.getIsAsc()))
+				{
+					sb.append(" ").append(tablepar.getIsAsc());
+				}else
+				{
+					sb.append(" asc ");
+				}
+				example.setOrderByClause(String.valueOf(sb));
+			}else {
+				example.setOrderByClause("transmittime ASC");
+			}
+			PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+			List<Wobugeq> vos= wobugeqMapper.selectByExample(example);
+			pageInfo = new PageInfo<Wobugeq>(vos);
+
+
+		}
+
+		return pageInfo;
+
+	}
+
 }

+ 42 - 0
src/main/java/com/gyee/frame/service/WtReportMainService.java

@@ -1,12 +1,15 @@
 package com.gyee.frame.service;
 
 import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.common.support.Convert;
 import com.gyee.frame.mapper.auto.WtReportMainMapper;
+import com.gyee.frame.model.auto.Windturbine;
 import com.gyee.frame.model.auto.WtReportMain;
 import com.gyee.frame.model.auto.WtReportMainExample;
 import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.SnowflakeIdWorker;
+import com.gyee.frame.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -116,6 +119,45 @@ public class WtReportMainService implements BaseService<WtReportMain, WtReportMa
 
 	}
 
+	public List<WtReportMain> getReportList(String wpId,String wtId, Date beginDate,Date endDate) {
+
+
+		List<WtReportMain> list=new ArrayList<>();
+
+		WtReportMainExample example=new WtReportMainExample();
+		example.setOrderByClause("recodedate asc");
+
+		WtReportMainExample.Criteria criteria =example.createCriteria();
+
+		if(StringUtils.notEmp(wpId))
+		{
+			if(InitialRunner.wp_wtmap.containsKey(wpId))
+			{
+				List<Windturbine> wtls=InitialRunner.wp_wtmap.get(wpId);
+				List<String> ids=new ArrayList<>();
+				for(Windturbine wt:wtls)
+				{
+					ids.add(wt.getId());
+				}
+				criteria.andWtidIn(ids);
+			}
+
+		}
+		if(StringUtils.notEmp(wtId))
+		{
+			criteria.andWtidEqualTo(wtId);
+		}
+
+
+		criteria.andRecodedateGreaterThanOrEqualTo(beginDate).andRecodedateLessThan(endDate);
+
+
+		list= wtReportMainMapper.selectByExample(example);
+
+		return list;
+
+	}
+
 	public WtReportMain findWtReportMainById(String wtId, Date recorddate) {
 
 		WtReportMain po=new WtReportMain();

+ 192 - 5
src/main/java/com/gyee/frame/service/recommen/RecommenService.java

@@ -1,14 +1,12 @@
 package com.gyee.frame.service.recommen;
 
+import com.github.pagehelper.PageInfo;
 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.MainTrackVo;
+import com.gyee.frame.model.custom.*;
 import com.gyee.frame.service.*;
-import com.gyee.frame.util.IRealTimeDataBaseUtil;
-import com.gyee.frame.util.MathUtil;
-import com.gyee.frame.util.StringUtils;
+import com.gyee.frame.util.*;
 import com.gyee.frame.util.golden.EdosUtil;
 import org.springframework.stereotype.Service;
 
@@ -40,9 +38,25 @@ public class RecommenService {
 	private WtReportMainService wtReportMainService;
 	@Resource
 	private WobugeqService wobugeqService;
+	@Resource
+	private ShbrUserService shbrUserService;
+	@Resource
+	private ShbraceletUserService shbraceletUserService;
+	@Resource
+	private ShbraceletPointkeyService shbraceletPointkeyService;
+
+	@Resource
+	private EquipmentSqlService equipmentSqlService;
+	@Resource
+	private MismapSqlService mismapSqlService;
+	@Resource
+	private WindturbineSqlService windturbineSqlService;
+
 
 	IRealTimeDataBaseUtil realApiUtil = new EdosUtil();
 
+	private long INTERVAL=600;
+
 	/**
 	 * 获得当日健康推荐检修风机
 	 * @return
@@ -435,6 +449,23 @@ public class RecommenService {
 			}
 		}
 
+
+		if ( StringUtils.notEmp(vo.getWorkleader())) {
+			long diff = 0l;
+			double workHours=0;
+			if ( StringUtils.notEmp(vo.getDeparturetime()) && StringUtils.notEmp(vo.getChecktime())) {
+
+				diff = vo.getChecktime().getTime() - vo.getDeparturetime().getTime();
+				workHours = (double) (diff / (1000 * 60));
+			} else if (vo.getDeparturetime() != null &&  StringUtils.empty(vo.getChecktime())) {
+				diff = new Date().getTime() - vo.getDeparturetime().getTime();
+				workHours = (double) (diff / (1000 * 60));
+			} else {
+				workHours = 0.0;
+			}
+
+			vo.setWorkHours(workHours);//消缺时长
+		}
 		return vo;
 	}
 
@@ -447,4 +478,160 @@ public class RecommenService {
 
 		return minuts;
 	}
+
+	/**
+	 * 获得未完成消缺单列表
+	 * @return
+	 */
+	public List<WoBugEqVo> unfinishedList(String wpId, String wtId, Date beginDate, Date endDate) {
+
+		List<WoBugEqVo> list=new ArrayList<>();
+
+
+
+		list=recommenmainMsSqlService.unfinishedList(wpId,wtId, beginDate, endDate);
+
+		return list;
+	}
+
+	/**
+	 * 获得完成消缺单列表
+	 * @return
+	 */
+	public List<WoBugEqVo> finishedList(String wpId, String wtId, Date beginDate, Date endDate) {
+
+		List<WoBugEqVo> list=new ArrayList<>();
+
+
+
+		list=recommenmainMsSqlService.finishedList(wpId,wtId, beginDate, endDate);
+
+		return list;
+	}
+
+	/**
+	 * 通过用户姓名和开始检修时间和结束检修时间获取手环实时和历史数据
+	 * @param name
+	 * @param beginDate
+	 * @param endDate
+	 * @return
+	 * @throws Exception
+	 */
+	public Map<String,Map<String,Object>> findShbraceletList(String name,String beginDate,String endDate) throws Exception {
+
+		Map<String,Map<String,Object>> result=new HashMap<>();
+
+
+		if(StringUtils.notEmp(name) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate))
+		{
+			ShbrUser user=shbrUserService.findShbrUserByName(name);
+
+			if(StringUtils.notEmp(user) && StringUtils.notEmp(user.getId()))
+			{
+				ShbraceletUser shbraceletUser=shbraceletUserService.findShbraceletUserById(user.getId());
+
+				if(StringUtils.notEmp(shbraceletUser) && StringUtils.notEmp(shbraceletUser.getDeviceid()))
+				{
+					List<ShbraceletPointkey> list=shbraceletPointkeyService.findShbraceletPointkeyList(shbraceletUser.getDeviceid());
+
+					if(!list.isEmpty())
+					{
+						Date begin= DateUtils.parseDate(beginDate);
+						Date end= DateUtils.parseDate(endDate);
+
+						Map<String,Object> map1=new HashMap<>();
+						Map<String,Object> map2=new HashMap<>();
+
+						result.put("ss",map1);
+						result.put("ls",map2);
+						for(ShbraceletPointkey po:list)
+						{
+
+							String pointkey=po.getPointkey();
+							String key=pointkey.substring(pointkey.lastIndexOf("_")+1);
+							PointData pd=realApiUtil.getRealData(po.getPointkey());
+
+							map1.put(key,pd.getPointValueInDouble());
+							long count = (end.getTime() / 1000 - begin.getTime()) / 600;
+							List<PointData> ls = realApiUtil.getHistoryDatasSnap(pointkey, begin.getTime() / 1000, end.getTime() / 1000, count, INTERVAL);
+							if(!ls.isEmpty())
+							{
+								map2.put(key,ls);
+							}else
+							{
+								map2.put(key,new ArrayList<>());
+							}
+
+							result.put("ss",map1);
+							result.put("ls",map2);
+						}
+					}
+				}
+			}
+		}
+
+		return result;
+	}
+
+//	@Resource
+//	private EquipmentSqlService equipmentSqlService;
+//	@Resource
+//	private MismapSqlService mismapSqlService;
+//	@Resource
+//	private WindturbineSqlService windturbineSqlService;
+
+	/**
+	 * 获取部件结构树
+	 * @return
+	 */
+	public String findLocationTreeByWtId(String wtId) {
+
+		String result="";
+		if (StringUtils.notEmp(wtId) ) {
+
+			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<ZtreeNode> nodes = new ArrayList<ZtreeNode>();
+					for(EquipmentSql eq:eqls)
+					{
+						ZtreeNode node=new ZtreeNode();
+						node.setId(eq.getLocation());
+						node.setPid(eq.getParent());
+						node.setName(eq.getDescription());
+						node.setOpen(true);
+						nodes.add(node);
+					}
+
+					TreeUtil treeUtil=new TreeUtil(nodes);
+					result=treeUtil.buildJSONTree();
+				}
+			}
+		}
+
+		return result;
+	}
+
+
+	/**
+	 * 通过位置编号获得缺陷单信息
+	 * @return
+	 */
+	public PageInfo<Wobugeq> findWobugeqByLocation(Tablepar tablepar,String location, Date beginDate, Date endDate) {
+
+		PageInfo<Wobugeq> pageInfo=new PageInfo<>();
+		if (StringUtils.notEmp(tablepar) && StringUtils.notEmp(location) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate) ) {
+
+			pageInfo=wobugeqService.findWobugeqByLocation(tablepar,location, beginDate, endDate);
+		}
+		return pageInfo;
+	}
+
+
 }

+ 20 - 0
src/main/java/com/gyee/frame/service/report/WtHealthReportService.java

@@ -31,6 +31,8 @@ public class WtHealthReportService{
 	private WtTragetReportChartService wtTragetReportChartService;
 
 
+
+
 	/**
 	 * 查询健康报告主表和子表数据
 	 * @param wtId
@@ -82,5 +84,23 @@ public class WtHealthReportService{
 		return vos;
 	}
 
+	/**
+	 * 通过查询条件获得健康报告主表信息
+	 * @param wpId
+	 * @param wtId
+	 * @param beginDate
+	 * @param endDate
+	 * @return
+	 */
+	public List<WtReportMain> getReportList(String wpId,String wtId, Date beginDate,Date endDate)
+	{
+		List<WtReportMain> wtrmls=new ArrayList<>();
+		if( StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate))
+		{
+			 wtrmls=wtReportMainService.getReportList(wpId,wtId, beginDate, endDate);
+
+		}
 
+		return wtrmls;
+	}
 }

+ 173 - 0
src/main/java/com/gyee/frame/util/TreeUtil.java

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

+ 7 - 7
src/main/resources/application-dev.yml

@@ -7,14 +7,14 @@ spring:
     druid:
      #主库数据源
      master:
-#        url: jdbc:mysql://localhost:3306/springbootv2?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
-#        username: root
-#        password: 123456
+        url: jdbc:mysql://localhost:3306/springbootv2?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
+        username: root
+        password: 123456
 
-        url: jdbc:oracle:thin:@192.168.1.105:1521:gdnxfd
-        username: nxfdprod
-        password: gdnxfd123
-        driver-class-name: oracle.jdbc.driver.OracleDriver
+#        url: jdbc:oracle:thin:@192.168.1.105:1521:gdnxfd
+#        username: nxfdprod
+#        password: gdnxfd123
+#        driver-class-name: oracle.jdbc.driver.OracleDriver
      #备数据源 #关闭
      slave:
         enabled: false

+ 1 - 1
src/main/resources/application.yml

@@ -109,7 +109,7 @@ spring :
 #    cache-enabled: false
 #pagehelper分页插件
 pagehelper:
-    helperDialect: oracle
+    helperDialect: mysql
     reasonable: true
     supportMethodsArguments: true
     params: count=countSql

+ 15 - 13
src/main/resources/mybatis-generator.xml

@@ -51,19 +51,19 @@
 <!--                userId="root"-->
 <!--                password="123456">-->
 <!--        </jdbcConnection>-->
-<!--        <jdbcConnection-->
-<!--                driverClass="oracle.jdbc.driver.OracleDriver"-->
-<!--                connectionURL="jdbc:oracle:thin:@192.168.1.105:1521:gdnxfd"-->
-<!--                userId="nxfdprod"-->
-<!--                password="gdnxfd123">-->
-<!--        </jdbcConnection>-->
+        <jdbcConnection
+                driverClass="oracle.jdbc.driver.OracleDriver"
+                connectionURL="jdbc:oracle:thin:@192.168.1.105:1521:gdnxfd"
+                userId="nxfdprod"
+                password="gdnxfd123">
+        </jdbcConnection>
 
-                <jdbcConnection
-                        driverClass="com.microsoft.sqlserver.jdbc.SQLServerDriver"
-                        connectionURL="jdbc:sqlserver://10.155.32.2:1433;DatabaseName=fdeam"
-                        userId="sa"
-                        password="Gyee@321#!">
-                </jdbcConnection>
+<!--                <jdbcConnection-->
+<!--                        driverClass="com.microsoft.sqlserver.jdbc.SQLServerDriver"-->
+<!--                        connectionURL="jdbc:sqlserver://10.155.32.2:1433;DatabaseName=fdeam"-->
+<!--                        userId="sa"-->
+<!--                        password="Gyee@321#!">-->
+<!--                </jdbcConnection>-->
         <javaTypeResolver>
             <property name="forceBigDecimals" value="false"/>
         </javaTypeResolver>
@@ -102,7 +102,9 @@
         </table>-->
 
 
-        <table tableName='Recommenmain' domainObjectName='RecommenmainMsSql'/>
+<!--        <table tableName='Windturbine' domainObjectName='WindturbineSql'/>-->
+<!--        <table tableName='Equipment' domainObjectName='EquipmentSql'/>-->
+        <table tableName='mismap' domainObjectName='MismapSql'/>
 
     </context>
 </generatorConfiguration>

File diff suppressed because it is too large
+ 1020 - 0
src/main/resources/mybatis/auto/EquipmentSqlMapper.xml


+ 224 - 0
src/main/resources/mybatis/auto/MismapSqlMapper.xml

@@ -0,0 +1,224 @@
+<?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.MismapSqlMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.MismapSql">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="SISKEY" jdbcType="VARCHAR" property="siskey" />
+    <result column="MISKEY" jdbcType="VARCHAR" property="miskey" />
+  </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.
+    -->
+    SISKEY, MISKEY
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.MismapSqlExample" 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 MISMAP
+    <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 MISMAP
+    where SISKEY = #{siskey,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 MISMAP
+    where SISKEY = #{siskey,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.MismapSqlExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from MISMAP
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.MismapSql">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into MISMAP (SISKEY, MISKEY)
+    values (#{siskey,jdbcType=VARCHAR}, #{miskey,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.MismapSql">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into MISMAP
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="siskey != null">
+        SISKEY,
+      </if>
+      <if test="miskey != null">
+        MISKEY,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="siskey != null">
+        #{siskey,jdbcType=VARCHAR},
+      </if>
+      <if test="miskey != null">
+        #{miskey,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.MismapSqlExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from MISMAP
+    <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 MISMAP
+    <set>
+      <if test="record.siskey != null">
+        SISKEY = #{record.siskey,jdbcType=VARCHAR},
+      </if>
+      <if test="record.miskey != null">
+        MISKEY = #{record.miskey,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 MISMAP
+    set SISKEY = #{record.siskey,jdbcType=VARCHAR},
+      MISKEY = #{record.miskey,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.MismapSql">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update MISMAP
+    <set>
+      <if test="miskey != null">
+        MISKEY = #{miskey,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where SISKEY = #{siskey,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.MismapSql">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update MISMAP
+    set MISKEY = #{miskey,jdbcType=VARCHAR}
+    where SISKEY = #{siskey,jdbcType=VARCHAR}
+  </update>
+</mapper>

+ 318 - 0
src/main/resources/mybatis/auto/ShbrUserMapper.xml

@@ -0,0 +1,318 @@
+<?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.ShbrUserMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.ShbrUser">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="DECIMAL" property="id" />
+    <result column="USERNAME" jdbcType="VARCHAR" property="username" />
+    <result column="MOBILE" jdbcType="VARCHAR" property="mobile" />
+    <result column="PASSWORD" jdbcType="VARCHAR" property="password" />
+    <result column="SALT" jdbcType="VARCHAR" property="salt" />
+    <result column="IMG" jdbcType="VARCHAR" property="img" />
+    <result column="CREATETIME" jdbcType="TIMESTAMP" property="createtime" />
+    <result column="STATIONID" jdbcType="VARCHAR" property="stationid" />
+  </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, USERNAME, MOBILE, PASSWORD, SALT, IMG, CREATETIME, STATIONID
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.ShbrUserExample" 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 SHBRUSER
+    <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.Short" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from SHBRUSER
+    where ID = #{id,jdbcType=DECIMAL}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from SHBRUSER
+    where ID = #{id,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.ShbrUserExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from SHBRUSER
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.ShbrUser">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into SHBRUSER (ID, USERNAME, MOBILE, 
+      PASSWORD, SALT, IMG, 
+      CREATETIME, STATIONID)
+    values (#{id,jdbcType=DECIMAL}, #{username,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, 
+      #{password,jdbcType=VARCHAR}, #{salt,jdbcType=VARCHAR}, #{img,jdbcType=VARCHAR}, 
+      #{createtime,jdbcType=TIMESTAMP}, #{stationid,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.ShbrUser">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into SHBRUSER
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="username != null">
+        USERNAME,
+      </if>
+      <if test="mobile != null">
+        MOBILE,
+      </if>
+      <if test="password != null">
+        PASSWORD,
+      </if>
+      <if test="salt != null">
+        SALT,
+      </if>
+      <if test="img != null">
+        IMG,
+      </if>
+      <if test="createtime != null">
+        CREATETIME,
+      </if>
+      <if test="stationid != null">
+        STATIONID,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=DECIMAL},
+      </if>
+      <if test="username != null">
+        #{username,jdbcType=VARCHAR},
+      </if>
+      <if test="mobile != null">
+        #{mobile,jdbcType=VARCHAR},
+      </if>
+      <if test="password != null">
+        #{password,jdbcType=VARCHAR},
+      </if>
+      <if test="salt != null">
+        #{salt,jdbcType=VARCHAR},
+      </if>
+      <if test="img != null">
+        #{img,jdbcType=VARCHAR},
+      </if>
+      <if test="createtime != null">
+        #{createtime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="stationid != null">
+        #{stationid,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.ShbrUserExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from SHBRUSER
+    <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 SHBRUSER
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=DECIMAL},
+      </if>
+      <if test="record.username != null">
+        USERNAME = #{record.username,jdbcType=VARCHAR},
+      </if>
+      <if test="record.mobile != null">
+        MOBILE = #{record.mobile,jdbcType=VARCHAR},
+      </if>
+      <if test="record.password != null">
+        PASSWORD = #{record.password,jdbcType=VARCHAR},
+      </if>
+      <if test="record.salt != null">
+        SALT = #{record.salt,jdbcType=VARCHAR},
+      </if>
+      <if test="record.img != null">
+        IMG = #{record.img,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createtime != null">
+        CREATETIME = #{record.createtime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.stationid != null">
+        STATIONID = #{record.stationid,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 SHBRUSER
+    set ID = #{record.id,jdbcType=DECIMAL},
+      USERNAME = #{record.username,jdbcType=VARCHAR},
+      MOBILE = #{record.mobile,jdbcType=VARCHAR},
+      PASSWORD = #{record.password,jdbcType=VARCHAR},
+      SALT = #{record.salt,jdbcType=VARCHAR},
+      IMG = #{record.img,jdbcType=VARCHAR},
+      CREATETIME = #{record.createtime,jdbcType=TIMESTAMP},
+      STATIONID = #{record.stationid,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.ShbrUser">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update SHBRUSER
+    <set>
+      <if test="username != null">
+        USERNAME = #{username,jdbcType=VARCHAR},
+      </if>
+      <if test="mobile != null">
+        MOBILE = #{mobile,jdbcType=VARCHAR},
+      </if>
+      <if test="password != null">
+        PASSWORD = #{password,jdbcType=VARCHAR},
+      </if>
+      <if test="salt != null">
+        SALT = #{salt,jdbcType=VARCHAR},
+      </if>
+      <if test="img != null">
+        IMG = #{img,jdbcType=VARCHAR},
+      </if>
+      <if test="createtime != null">
+        CREATETIME = #{createtime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="stationid != null">
+        STATIONID = #{stationid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.ShbrUser">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update SHBRUSER
+    set USERNAME = #{username,jdbcType=VARCHAR},
+      MOBILE = #{mobile,jdbcType=VARCHAR},
+      PASSWORD = #{password,jdbcType=VARCHAR},
+      SALT = #{salt,jdbcType=VARCHAR},
+      IMG = #{img,jdbcType=VARCHAR},
+      CREATETIME = #{createtime,jdbcType=TIMESTAMP},
+      STATIONID = #{stationid,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+</mapper>

+ 256 - 0
src/main/resources/mybatis/auto/ShbraceletPointkeyMapper.xml

@@ -0,0 +1,256 @@
+<?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.ShbraceletPointkeyMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.ShbraceletPointkey">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="DECIMAL" property="id" />
+    <result column="POINTKEY" jdbcType="VARCHAR" property="pointkey" />
+    <result column="DEVICEID" jdbcType="DECIMAL" property="deviceid" />
+    <result column="CREATETIME" jdbcType="TIMESTAMP" property="createtime" />
+  </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, POINTKEY, DEVICEID, CREATETIME
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.ShbraceletPointkeyExample" 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 SHBRACELETPOINTKEY
+    <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.Short" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from SHBRACELETPOINTKEY
+    where ID = #{id,jdbcType=DECIMAL}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from SHBRACELETPOINTKEY
+    where ID = #{id,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.ShbraceletPointkeyExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from SHBRACELETPOINTKEY
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.ShbraceletPointkey">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into SHBRACELETPOINTKEY (ID, POINTKEY, DEVICEID, 
+      CREATETIME)
+    values (#{id,jdbcType=DECIMAL}, #{pointkey,jdbcType=VARCHAR}, #{deviceid,jdbcType=DECIMAL}, 
+      #{createtime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.ShbraceletPointkey">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into SHBRACELETPOINTKEY
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="pointkey != null">
+        POINTKEY,
+      </if>
+      <if test="deviceid != null">
+        DEVICEID,
+      </if>
+      <if test="createtime != null">
+        CREATETIME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=DECIMAL},
+      </if>
+      <if test="pointkey != null">
+        #{pointkey,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceid != null">
+        #{deviceid,jdbcType=DECIMAL},
+      </if>
+      <if test="createtime != null">
+        #{createtime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.ShbraceletPointkeyExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from SHBRACELETPOINTKEY
+    <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 SHBRACELETPOINTKEY
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=DECIMAL},
+      </if>
+      <if test="record.pointkey != null">
+        POINTKEY = #{record.pointkey,jdbcType=VARCHAR},
+      </if>
+      <if test="record.deviceid != null">
+        DEVICEID = #{record.deviceid,jdbcType=DECIMAL},
+      </if>
+      <if test="record.createtime != null">
+        CREATETIME = #{record.createtime,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 SHBRACELETPOINTKEY
+    set ID = #{record.id,jdbcType=DECIMAL},
+      POINTKEY = #{record.pointkey,jdbcType=VARCHAR},
+      DEVICEID = #{record.deviceid,jdbcType=DECIMAL},
+      CREATETIME = #{record.createtime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.ShbraceletPointkey">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update SHBRACELETPOINTKEY
+    <set>
+      <if test="pointkey != null">
+        POINTKEY = #{pointkey,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceid != null">
+        DEVICEID = #{deviceid,jdbcType=DECIMAL},
+      </if>
+      <if test="createtime != null">
+        CREATETIME = #{createtime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.ShbraceletPointkey">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update SHBRACELETPOINTKEY
+    set POINTKEY = #{pointkey,jdbcType=VARCHAR},
+      DEVICEID = #{deviceid,jdbcType=DECIMAL},
+      CREATETIME = #{createtime,jdbcType=TIMESTAMP}
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+</mapper>

+ 256 - 0
src/main/resources/mybatis/auto/ShbraceletUserMapper.xml

@@ -0,0 +1,256 @@
+<?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.ShbraceletUserMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.ShbraceletUser">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="DECIMAL" property="id" />
+    <result column="DEVICEID" jdbcType="DECIMAL" property="deviceid" />
+    <result column="USERID" jdbcType="DECIMAL" property="userid" />
+    <result column="CREATETIME" jdbcType="TIMESTAMP" property="createtime" />
+  </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, DEVICEID, USERID, CREATETIME
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.ShbraceletUserExample" 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 SHBRACELETUSER
+    <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.Short" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from SHBRACELETUSER
+    where ID = #{id,jdbcType=DECIMAL}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from SHBRACELETUSER
+    where ID = #{id,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.ShbraceletUserExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from SHBRACELETUSER
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.ShbraceletUser">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into SHBRACELETUSER (ID, DEVICEID, USERID, 
+      CREATETIME)
+    values (#{id,jdbcType=DECIMAL}, #{deviceid,jdbcType=DECIMAL}, #{userid,jdbcType=DECIMAL}, 
+      #{createtime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.ShbraceletUser">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into SHBRACELETUSER
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="deviceid != null">
+        DEVICEID,
+      </if>
+      <if test="userid != null">
+        USERID,
+      </if>
+      <if test="createtime != null">
+        CREATETIME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=DECIMAL},
+      </if>
+      <if test="deviceid != null">
+        #{deviceid,jdbcType=DECIMAL},
+      </if>
+      <if test="userid != null">
+        #{userid,jdbcType=DECIMAL},
+      </if>
+      <if test="createtime != null">
+        #{createtime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.ShbraceletUserExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from SHBRACELETUSER
+    <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 SHBRACELETUSER
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=DECIMAL},
+      </if>
+      <if test="record.deviceid != null">
+        DEVICEID = #{record.deviceid,jdbcType=DECIMAL},
+      </if>
+      <if test="record.userid != null">
+        USERID = #{record.userid,jdbcType=DECIMAL},
+      </if>
+      <if test="record.createtime != null">
+        CREATETIME = #{record.createtime,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 SHBRACELETUSER
+    set ID = #{record.id,jdbcType=DECIMAL},
+      DEVICEID = #{record.deviceid,jdbcType=DECIMAL},
+      USERID = #{record.userid,jdbcType=DECIMAL},
+      CREATETIME = #{record.createtime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.ShbraceletUser">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update SHBRACELETUSER
+    <set>
+      <if test="deviceid != null">
+        DEVICEID = #{deviceid,jdbcType=DECIMAL},
+      </if>
+      <if test="userid != null">
+        USERID = #{userid,jdbcType=DECIMAL},
+      </if>
+      <if test="createtime != null">
+        CREATETIME = #{createtime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.ShbraceletUser">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update SHBRACELETUSER
+    set DEVICEID = #{deviceid,jdbcType=DECIMAL},
+      USERID = #{userid,jdbcType=DECIMAL},
+      CREATETIME = #{createtime,jdbcType=TIMESTAMP}
+    where ID = #{id,jdbcType=DECIMAL}
+  </update>
+</mapper>

+ 667 - 0
src/main/resources/mybatis/auto/WindturbineSqlMapper.xml

@@ -0,0 +1,667 @@
+<?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.WindturbineSqlMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.WindturbineSql">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="NUMERIC" property="id" />
+    <result column="WTNUM" jdbcType="NUMERIC" property="wtnum" />
+    <result column="OWNERWF" jdbcType="NUMERIC" property="ownerwf" />
+    <result column="OWNERPROJECT" jdbcType="NUMERIC" property="ownerproject" />
+    <result column="OWNERLINE" jdbcType="NUMERIC" property="ownerline" />
+    <result column="ORDERNUM" jdbcType="NUMERIC" property="ordernum" />
+    <result column="WTWFNUM" jdbcType="NVARCHAR" property="wtwfnum" />
+    <result column="WTGRIDNUM" jdbcType="NVARCHAR" property="wtgridnum" />
+    <result column="VENDOR" jdbcType="NVARCHAR" property="vendor" />
+    <result column="MODEL" jdbcType="NVARCHAR" property="model" />
+    <result column="RATEDPOWER" jdbcType="DECIMAL" property="ratedpower" />
+    <result column="RATEDWINSPE" jdbcType="DECIMAL" property="ratedwinspe" />
+    <result column="RATEDVOLTAGE" jdbcType="DECIMAL" property="ratedvoltage" />
+    <result column="RATEDREV" jdbcType="DECIMAL" property="ratedrev" />
+    <result column="CUTINWINSPE" jdbcType="DECIMAL" property="cutinwinspe" />
+    <result column="CUTOUTWINSPE" jdbcType="DECIMAL" property="cutoutwinspe" />
+    <result column="MAXWINSPE" jdbcType="DECIMAL" property="maxwinspe" />
+    <result column="LOWERTEMP" jdbcType="DECIMAL" property="lowertemp" />
+    <result column="HIGHTEMP" jdbcType="DECIMAL" property="hightemp" />
+    <result column="LOWERREV" jdbcType="DECIMAL" property="lowerrev" />
+    <result column="HIGHREV" jdbcType="DECIMAL" property="highrev" />
+    <result column="ROTERDIAMETER" jdbcType="DECIMAL" property="roterdiameter" />
+    <result column="HUBHEIGHT" jdbcType="DECIMAL" property="hubheight" />
+    <result column="RELEASEDATE" jdbcType="TIMESTAMP" property="releasedate" />
+    <result column="INSTALLDATE" jdbcType="TIMESTAMP" property="installdate" />
+    <result column="TESTDATE" jdbcType="TIMESTAMP" property="testdate" />
+    <result column="OPDATE" jdbcType="TIMESTAMP" property="opdate" />
+    <result column="LOCATION" jdbcType="NVARCHAR" property="location" />
+    <result column="WFLOCATION" jdbcType="NVARCHAR" property="wflocation" />
+    <result column="WTID" jdbcType="NVARCHAR" 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, WTNUM, OWNERWF, OWNERPROJECT, OWNERLINE, ORDERNUM, WTWFNUM, WTGRIDNUM, VENDOR, 
+    MODEL, RATEDPOWER, RATEDWINSPE, RATEDVOLTAGE, RATEDREV, CUTINWINSPE, CUTOUTWINSPE, 
+    MAXWINSPE, LOWERTEMP, HIGHTEMP, LOWERREV, HIGHREV, ROTERDIAMETER, HUBHEIGHT, RELEASEDATE, 
+    INSTALLDATE, TESTDATE, OPDATE, LOCATION, WFLOCATION, WTID
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.WindturbineSqlExample" 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 WINDTURBINE
+    <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 WINDTURBINE
+    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 WINDTURBINE
+    where ID = #{id,jdbcType=NUMERIC}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.WindturbineSqlExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from WINDTURBINE
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.WindturbineSql">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WINDTURBINE (ID, WTNUM, OWNERWF, 
+      OWNERPROJECT, OWNERLINE, ORDERNUM, 
+      WTWFNUM, WTGRIDNUM, VENDOR, 
+      MODEL, RATEDPOWER, RATEDWINSPE, 
+      RATEDVOLTAGE, RATEDREV, CUTINWINSPE, 
+      CUTOUTWINSPE, MAXWINSPE, LOWERTEMP, 
+      HIGHTEMP, LOWERREV, HIGHREV, 
+      ROTERDIAMETER, HUBHEIGHT, RELEASEDATE, 
+      INSTALLDATE, TESTDATE, OPDATE, 
+      LOCATION, WFLOCATION, WTID
+      )
+    values (#{id,jdbcType=NUMERIC}, #{wtnum,jdbcType=NUMERIC}, #{ownerwf,jdbcType=NUMERIC}, 
+      #{ownerproject,jdbcType=NUMERIC}, #{ownerline,jdbcType=NUMERIC}, #{ordernum,jdbcType=NUMERIC}, 
+      #{wtwfnum,jdbcType=NVARCHAR}, #{wtgridnum,jdbcType=NVARCHAR}, #{vendor,jdbcType=NVARCHAR}, 
+      #{model,jdbcType=NVARCHAR}, #{ratedpower,jdbcType=DECIMAL}, #{ratedwinspe,jdbcType=DECIMAL}, 
+      #{ratedvoltage,jdbcType=DECIMAL}, #{ratedrev,jdbcType=DECIMAL}, #{cutinwinspe,jdbcType=DECIMAL}, 
+      #{cutoutwinspe,jdbcType=DECIMAL}, #{maxwinspe,jdbcType=DECIMAL}, #{lowertemp,jdbcType=DECIMAL}, 
+      #{hightemp,jdbcType=DECIMAL}, #{lowerrev,jdbcType=DECIMAL}, #{highrev,jdbcType=DECIMAL}, 
+      #{roterdiameter,jdbcType=DECIMAL}, #{hubheight,jdbcType=DECIMAL}, #{releasedate,jdbcType=TIMESTAMP}, 
+      #{installdate,jdbcType=TIMESTAMP}, #{testdate,jdbcType=TIMESTAMP}, #{opdate,jdbcType=TIMESTAMP}, 
+      #{location,jdbcType=NVARCHAR}, #{wflocation,jdbcType=NVARCHAR}, #{wtid,jdbcType=NVARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.WindturbineSql">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into WINDTURBINE
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="wtnum != null">
+        WTNUM,
+      </if>
+      <if test="ownerwf != null">
+        OWNERWF,
+      </if>
+      <if test="ownerproject != null">
+        OWNERPROJECT,
+      </if>
+      <if test="ownerline != null">
+        OWNERLINE,
+      </if>
+      <if test="ordernum != null">
+        ORDERNUM,
+      </if>
+      <if test="wtwfnum != null">
+        WTWFNUM,
+      </if>
+      <if test="wtgridnum != null">
+        WTGRIDNUM,
+      </if>
+      <if test="vendor != null">
+        VENDOR,
+      </if>
+      <if test="model != null">
+        MODEL,
+      </if>
+      <if test="ratedpower != null">
+        RATEDPOWER,
+      </if>
+      <if test="ratedwinspe != null">
+        RATEDWINSPE,
+      </if>
+      <if test="ratedvoltage != null">
+        RATEDVOLTAGE,
+      </if>
+      <if test="ratedrev != null">
+        RATEDREV,
+      </if>
+      <if test="cutinwinspe != null">
+        CUTINWINSPE,
+      </if>
+      <if test="cutoutwinspe != null">
+        CUTOUTWINSPE,
+      </if>
+      <if test="maxwinspe != null">
+        MAXWINSPE,
+      </if>
+      <if test="lowertemp != null">
+        LOWERTEMP,
+      </if>
+      <if test="hightemp != null">
+        HIGHTEMP,
+      </if>
+      <if test="lowerrev != null">
+        LOWERREV,
+      </if>
+      <if test="highrev != null">
+        HIGHREV,
+      </if>
+      <if test="roterdiameter != null">
+        ROTERDIAMETER,
+      </if>
+      <if test="hubheight != null">
+        HUBHEIGHT,
+      </if>
+      <if test="releasedate != null">
+        RELEASEDATE,
+      </if>
+      <if test="installdate != null">
+        INSTALLDATE,
+      </if>
+      <if test="testdate != null">
+        TESTDATE,
+      </if>
+      <if test="opdate != null">
+        OPDATE,
+      </if>
+      <if test="location != null">
+        LOCATION,
+      </if>
+      <if test="wflocation != null">
+        WFLOCATION,
+      </if>
+      <if test="wtid != null">
+        WTID,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=NUMERIC},
+      </if>
+      <if test="wtnum != null">
+        #{wtnum,jdbcType=NUMERIC},
+      </if>
+      <if test="ownerwf != null">
+        #{ownerwf,jdbcType=NUMERIC},
+      </if>
+      <if test="ownerproject != null">
+        #{ownerproject,jdbcType=NUMERIC},
+      </if>
+      <if test="ownerline != null">
+        #{ownerline,jdbcType=NUMERIC},
+      </if>
+      <if test="ordernum != null">
+        #{ordernum,jdbcType=NUMERIC},
+      </if>
+      <if test="wtwfnum != null">
+        #{wtwfnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="wtgridnum != null">
+        #{wtgridnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="vendor != null">
+        #{vendor,jdbcType=NVARCHAR},
+      </if>
+      <if test="model != null">
+        #{model,jdbcType=NVARCHAR},
+      </if>
+      <if test="ratedpower != null">
+        #{ratedpower,jdbcType=DECIMAL},
+      </if>
+      <if test="ratedwinspe != null">
+        #{ratedwinspe,jdbcType=DECIMAL},
+      </if>
+      <if test="ratedvoltage != null">
+        #{ratedvoltage,jdbcType=DECIMAL},
+      </if>
+      <if test="ratedrev != null">
+        #{ratedrev,jdbcType=DECIMAL},
+      </if>
+      <if test="cutinwinspe != null">
+        #{cutinwinspe,jdbcType=DECIMAL},
+      </if>
+      <if test="cutoutwinspe != null">
+        #{cutoutwinspe,jdbcType=DECIMAL},
+      </if>
+      <if test="maxwinspe != null">
+        #{maxwinspe,jdbcType=DECIMAL},
+      </if>
+      <if test="lowertemp != null">
+        #{lowertemp,jdbcType=DECIMAL},
+      </if>
+      <if test="hightemp != null">
+        #{hightemp,jdbcType=DECIMAL},
+      </if>
+      <if test="lowerrev != null">
+        #{lowerrev,jdbcType=DECIMAL},
+      </if>
+      <if test="highrev != null">
+        #{highrev,jdbcType=DECIMAL},
+      </if>
+      <if test="roterdiameter != null">
+        #{roterdiameter,jdbcType=DECIMAL},
+      </if>
+      <if test="hubheight != null">
+        #{hubheight,jdbcType=DECIMAL},
+      </if>
+      <if test="releasedate != null">
+        #{releasedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="installdate != null">
+        #{installdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="testdate != null">
+        #{testdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="opdate != null">
+        #{opdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="location != null">
+        #{location,jdbcType=NVARCHAR},
+      </if>
+      <if test="wflocation != null">
+        #{wflocation,jdbcType=NVARCHAR},
+      </if>
+      <if test="wtid != null">
+        #{wtid,jdbcType=NVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.WindturbineSqlExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from WINDTURBINE
+    <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 WINDTURBINE
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=NUMERIC},
+      </if>
+      <if test="record.wtnum != null">
+        WTNUM = #{record.wtnum,jdbcType=NUMERIC},
+      </if>
+      <if test="record.ownerwf != null">
+        OWNERWF = #{record.ownerwf,jdbcType=NUMERIC},
+      </if>
+      <if test="record.ownerproject != null">
+        OWNERPROJECT = #{record.ownerproject,jdbcType=NUMERIC},
+      </if>
+      <if test="record.ownerline != null">
+        OWNERLINE = #{record.ownerline,jdbcType=NUMERIC},
+      </if>
+      <if test="record.ordernum != null">
+        ORDERNUM = #{record.ordernum,jdbcType=NUMERIC},
+      </if>
+      <if test="record.wtwfnum != null">
+        WTWFNUM = #{record.wtwfnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.wtgridnum != null">
+        WTGRIDNUM = #{record.wtgridnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.vendor != null">
+        VENDOR = #{record.vendor,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.model != null">
+        MODEL = #{record.model,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.ratedpower != null">
+        RATEDPOWER = #{record.ratedpower,jdbcType=DECIMAL},
+      </if>
+      <if test="record.ratedwinspe != null">
+        RATEDWINSPE = #{record.ratedwinspe,jdbcType=DECIMAL},
+      </if>
+      <if test="record.ratedvoltage != null">
+        RATEDVOLTAGE = #{record.ratedvoltage,jdbcType=DECIMAL},
+      </if>
+      <if test="record.ratedrev != null">
+        RATEDREV = #{record.ratedrev,jdbcType=DECIMAL},
+      </if>
+      <if test="record.cutinwinspe != null">
+        CUTINWINSPE = #{record.cutinwinspe,jdbcType=DECIMAL},
+      </if>
+      <if test="record.cutoutwinspe != null">
+        CUTOUTWINSPE = #{record.cutoutwinspe,jdbcType=DECIMAL},
+      </if>
+      <if test="record.maxwinspe != null">
+        MAXWINSPE = #{record.maxwinspe,jdbcType=DECIMAL},
+      </if>
+      <if test="record.lowertemp != null">
+        LOWERTEMP = #{record.lowertemp,jdbcType=DECIMAL},
+      </if>
+      <if test="record.hightemp != null">
+        HIGHTEMP = #{record.hightemp,jdbcType=DECIMAL},
+      </if>
+      <if test="record.lowerrev != null">
+        LOWERREV = #{record.lowerrev,jdbcType=DECIMAL},
+      </if>
+      <if test="record.highrev != null">
+        HIGHREV = #{record.highrev,jdbcType=DECIMAL},
+      </if>
+      <if test="record.roterdiameter != null">
+        ROTERDIAMETER = #{record.roterdiameter,jdbcType=DECIMAL},
+      </if>
+      <if test="record.hubheight != null">
+        HUBHEIGHT = #{record.hubheight,jdbcType=DECIMAL},
+      </if>
+      <if test="record.releasedate != null">
+        RELEASEDATE = #{record.releasedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.installdate != null">
+        INSTALLDATE = #{record.installdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.testdate != null">
+        TESTDATE = #{record.testdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.opdate != null">
+        OPDATE = #{record.opdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.location != null">
+        LOCATION = #{record.location,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.wflocation != null">
+        WFLOCATION = #{record.wflocation,jdbcType=NVARCHAR},
+      </if>
+      <if test="record.wtid != null">
+        WTID = #{record.wtid,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 WINDTURBINE
+    set ID = #{record.id,jdbcType=NUMERIC},
+      WTNUM = #{record.wtnum,jdbcType=NUMERIC},
+      OWNERWF = #{record.ownerwf,jdbcType=NUMERIC},
+      OWNERPROJECT = #{record.ownerproject,jdbcType=NUMERIC},
+      OWNERLINE = #{record.ownerline,jdbcType=NUMERIC},
+      ORDERNUM = #{record.ordernum,jdbcType=NUMERIC},
+      WTWFNUM = #{record.wtwfnum,jdbcType=NVARCHAR},
+      WTGRIDNUM = #{record.wtgridnum,jdbcType=NVARCHAR},
+      VENDOR = #{record.vendor,jdbcType=NVARCHAR},
+      MODEL = #{record.model,jdbcType=NVARCHAR},
+      RATEDPOWER = #{record.ratedpower,jdbcType=DECIMAL},
+      RATEDWINSPE = #{record.ratedwinspe,jdbcType=DECIMAL},
+      RATEDVOLTAGE = #{record.ratedvoltage,jdbcType=DECIMAL},
+      RATEDREV = #{record.ratedrev,jdbcType=DECIMAL},
+      CUTINWINSPE = #{record.cutinwinspe,jdbcType=DECIMAL},
+      CUTOUTWINSPE = #{record.cutoutwinspe,jdbcType=DECIMAL},
+      MAXWINSPE = #{record.maxwinspe,jdbcType=DECIMAL},
+      LOWERTEMP = #{record.lowertemp,jdbcType=DECIMAL},
+      HIGHTEMP = #{record.hightemp,jdbcType=DECIMAL},
+      LOWERREV = #{record.lowerrev,jdbcType=DECIMAL},
+      HIGHREV = #{record.highrev,jdbcType=DECIMAL},
+      ROTERDIAMETER = #{record.roterdiameter,jdbcType=DECIMAL},
+      HUBHEIGHT = #{record.hubheight,jdbcType=DECIMAL},
+      RELEASEDATE = #{record.releasedate,jdbcType=TIMESTAMP},
+      INSTALLDATE = #{record.installdate,jdbcType=TIMESTAMP},
+      TESTDATE = #{record.testdate,jdbcType=TIMESTAMP},
+      OPDATE = #{record.opdate,jdbcType=TIMESTAMP},
+      LOCATION = #{record.location,jdbcType=NVARCHAR},
+      WFLOCATION = #{record.wflocation,jdbcType=NVARCHAR},
+      WTID = #{record.wtid,jdbcType=NVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.WindturbineSql">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WINDTURBINE
+    <set>
+      <if test="wtnum != null">
+        WTNUM = #{wtnum,jdbcType=NUMERIC},
+      </if>
+      <if test="ownerwf != null">
+        OWNERWF = #{ownerwf,jdbcType=NUMERIC},
+      </if>
+      <if test="ownerproject != null">
+        OWNERPROJECT = #{ownerproject,jdbcType=NUMERIC},
+      </if>
+      <if test="ownerline != null">
+        OWNERLINE = #{ownerline,jdbcType=NUMERIC},
+      </if>
+      <if test="ordernum != null">
+        ORDERNUM = #{ordernum,jdbcType=NUMERIC},
+      </if>
+      <if test="wtwfnum != null">
+        WTWFNUM = #{wtwfnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="wtgridnum != null">
+        WTGRIDNUM = #{wtgridnum,jdbcType=NVARCHAR},
+      </if>
+      <if test="vendor != null">
+        VENDOR = #{vendor,jdbcType=NVARCHAR},
+      </if>
+      <if test="model != null">
+        MODEL = #{model,jdbcType=NVARCHAR},
+      </if>
+      <if test="ratedpower != null">
+        RATEDPOWER = #{ratedpower,jdbcType=DECIMAL},
+      </if>
+      <if test="ratedwinspe != null">
+        RATEDWINSPE = #{ratedwinspe,jdbcType=DECIMAL},
+      </if>
+      <if test="ratedvoltage != null">
+        RATEDVOLTAGE = #{ratedvoltage,jdbcType=DECIMAL},
+      </if>
+      <if test="ratedrev != null">
+        RATEDREV = #{ratedrev,jdbcType=DECIMAL},
+      </if>
+      <if test="cutinwinspe != null">
+        CUTINWINSPE = #{cutinwinspe,jdbcType=DECIMAL},
+      </if>
+      <if test="cutoutwinspe != null">
+        CUTOUTWINSPE = #{cutoutwinspe,jdbcType=DECIMAL},
+      </if>
+      <if test="maxwinspe != null">
+        MAXWINSPE = #{maxwinspe,jdbcType=DECIMAL},
+      </if>
+      <if test="lowertemp != null">
+        LOWERTEMP = #{lowertemp,jdbcType=DECIMAL},
+      </if>
+      <if test="hightemp != null">
+        HIGHTEMP = #{hightemp,jdbcType=DECIMAL},
+      </if>
+      <if test="lowerrev != null">
+        LOWERREV = #{lowerrev,jdbcType=DECIMAL},
+      </if>
+      <if test="highrev != null">
+        HIGHREV = #{highrev,jdbcType=DECIMAL},
+      </if>
+      <if test="roterdiameter != null">
+        ROTERDIAMETER = #{roterdiameter,jdbcType=DECIMAL},
+      </if>
+      <if test="hubheight != null">
+        HUBHEIGHT = #{hubheight,jdbcType=DECIMAL},
+      </if>
+      <if test="releasedate != null">
+        RELEASEDATE = #{releasedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="installdate != null">
+        INSTALLDATE = #{installdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="testdate != null">
+        TESTDATE = #{testdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="opdate != null">
+        OPDATE = #{opdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="location != null">
+        LOCATION = #{location,jdbcType=NVARCHAR},
+      </if>
+      <if test="wflocation != null">
+        WFLOCATION = #{wflocation,jdbcType=NVARCHAR},
+      </if>
+      <if test="wtid != null">
+        WTID = #{wtid,jdbcType=NVARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=NUMERIC}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.WindturbineSql">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update WINDTURBINE
+    set WTNUM = #{wtnum,jdbcType=NUMERIC},
+      OWNERWF = #{ownerwf,jdbcType=NUMERIC},
+      OWNERPROJECT = #{ownerproject,jdbcType=NUMERIC},
+      OWNERLINE = #{ownerline,jdbcType=NUMERIC},
+      ORDERNUM = #{ordernum,jdbcType=NUMERIC},
+      WTWFNUM = #{wtwfnum,jdbcType=NVARCHAR},
+      WTGRIDNUM = #{wtgridnum,jdbcType=NVARCHAR},
+      VENDOR = #{vendor,jdbcType=NVARCHAR},
+      MODEL = #{model,jdbcType=NVARCHAR},
+      RATEDPOWER = #{ratedpower,jdbcType=DECIMAL},
+      RATEDWINSPE = #{ratedwinspe,jdbcType=DECIMAL},
+      RATEDVOLTAGE = #{ratedvoltage,jdbcType=DECIMAL},
+      RATEDREV = #{ratedrev,jdbcType=DECIMAL},
+      CUTINWINSPE = #{cutinwinspe,jdbcType=DECIMAL},
+      CUTOUTWINSPE = #{cutoutwinspe,jdbcType=DECIMAL},
+      MAXWINSPE = #{maxwinspe,jdbcType=DECIMAL},
+      LOWERTEMP = #{lowertemp,jdbcType=DECIMAL},
+      HIGHTEMP = #{hightemp,jdbcType=DECIMAL},
+      LOWERREV = #{lowerrev,jdbcType=DECIMAL},
+      HIGHREV = #{highrev,jdbcType=DECIMAL},
+      ROTERDIAMETER = #{roterdiameter,jdbcType=DECIMAL},
+      HUBHEIGHT = #{hubheight,jdbcType=DECIMAL},
+      RELEASEDATE = #{releasedate,jdbcType=TIMESTAMP},
+      INSTALLDATE = #{installdate,jdbcType=TIMESTAMP},
+      TESTDATE = #{testdate,jdbcType=TIMESTAMP},
+      OPDATE = #{opdate,jdbcType=TIMESTAMP},
+      LOCATION = #{location,jdbcType=NVARCHAR},
+      WFLOCATION = #{wflocation,jdbcType=NVARCHAR},
+      WTID = #{wtid,jdbcType=NVARCHAR}
+    where ID = #{id,jdbcType=NUMERIC}
+  </update>
+</mapper>

+ 70 - 24
src/test/java/test/RecommenTest.java

@@ -1,16 +1,18 @@
 package test;
 
+import com.github.pagehelper.PageInfo;
 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.MainTrackVo;
+import com.gyee.frame.model.auto.Wobugeq;
+import com.gyee.frame.model.custom.Tablepar;
 import lombok.SneakyThrows;
 import org.springframework.boot.SpringApplication;
 
 import java.util.Calendar;
 import java.util.Date;
-import java.util.Map;
+import java.util.List;
 
 public class RecommenTest {
 
@@ -88,36 +90,80 @@ public class RecommenTest {
 //            System.out.println(wtd.getRecodedate()+"----------------"+wtd.getReason()+"----------------"+wtd.getReason());
 //        }
 //        System.out.println("**********************************************************************************");
-
-
-        System.out.println("**********************************************************************************");
-        AjaxResult ajaxResult = recommenController.findAllChartjz("MHS_FDC","2");
-
+//
+//
+//        System.out.println("**********************************************************************************");
+//        AjaxResult ajaxResult = recommenController.findAllChartjz("MHS_FDC","2");
+//
 //        map.put("yslchart", yslchart);
 //        map.put("lslchart", lslchart);
 //        map.put("cslchart", cslchart);
 //        map.put("lvchart", lvchart);
 //        map.put("datechart", datechart);
-        Map<String, Object[]> test=(Map<String, Object[]>)ajaxResult.get("data");
-        Double[] yslchart=(Double[])test.get("yslchart");
-        String[] datechart=(String[])test.get("datechart");
-        for(Double wtd:yslchart)
-        {
-            System.out.println(wtd);
-        }
-
-        for(String wtd:datechart)
+//        Map<String, Object[]> test=(Map<String, Object[]>)ajaxResult.get("data");
+//        Double[] yslchart=(Double[])test.get("yslchart");
+//        String[] datechart=(String[])test.get("datechart");
+//        for(Double wtd:yslchart)
+//        {
+//            System.out.println(wtd);
+//        }
+//
+//        for(String wtd:datechart)
+//        {
+//            System.out.println(wtd);
+//        }
+//        System.out.println("**********************************************************************************");
+//
+//
+//        AjaxResult ajax=recommenController.findMainTrack("0869af9c7f17468faecbeb3b96f21c87");
+//        MainTrackVo test4=(MainTrackVo)ajax.get("data");
+//        System.out.println(test4.getDdxcpjsc()+"***************"+test4.getBugnum());
+//        System.out.println("**********************************************************************************");
+//
+//
+//       AjaxResult ajaxResult = recommenController.findShbraceletList("王义波","2020-08-22 17:55:00","2020-08-22 18:51:00");
+//
+//        Map<String, Map<String,Object>> test=( Map<String,Map<String,Object>>)ajaxResult.get("data");
+//        Map<String,Object> map1=(Map<String,Object>)test.get("ss");
+//        Map<String,Object> map2=(Map<String,Object>)test.get("ls");
+//        Set<Map.Entry<String, Object>> set1 = map1.entrySet();
+//        for (Iterator<Map.Entry<String, Object>> it = set1.iterator(); it.hasNext();) {
+//            Map.Entry<String, Object> entry = (Map.Entry<String, Object>) it.next();
+//            System.out.println(entry.getKey() + "--->" + String.valueOf(entry.getValue()));
+//        }
+//        System.out.println("**********************************************************************************");
+//
+//        Set<Map.Entry<String, Object>> set2 = map2.entrySet();
+//        for (Iterator<Map.Entry<String, Object>> it = set2.iterator(); it.hasNext();) {
+//            Map.Entry<String, Object> entry = (Map.Entry<String, Object>) it.next();
+//            System.out.println(entry.getKey() + "--->" + entry.getValue());
+//            List<PointData> ls =(List<PointData>)entry.getValue();
+//            for(PointData po:ls)
+//            {
+//                System.out.println(po.getPointTime()+"*********************"+po.getPointValueInDouble());
+//            }
+//        }
+//        System.out.println("**********************************************************************************");
+//
+//        AjaxResult ajaxResult = recommenController.findLocationTreeByWtId("MG01_01");
+//
+//        String test=(String)ajaxResult.get("data");
+//
+//        System.out.println(test);
+//
+//        System.out.println("**********************************************************************************");
+        Tablepar tablepar = new Tablepar();
+        tablepar.setPageNum(1);
+        tablepar.setPageSize(10);
+       AjaxResult ajaxResult2 = recommenController.findWobugeqByLocation(tablepar,"010101020101");
+
+        PageInfo<Wobugeq> value=(PageInfo<Wobugeq>)ajaxResult2.get("data");
+        List<Wobugeq> test2=value.getList();
+        for(Wobugeq wtd:test2)
         {
-            System.out.println(wtd);
+            System.out.println(wtd.getBugnum()+"----------------"+wtd.getArrivaltime()+"----------------"+wtd.getProdtdeptopinion());
         }
         System.out.println("**********************************************************************************");
-
-
-        AjaxResult ajax=recommenController.findMainTrack("0869af9c7f17468faecbeb3b96f21c87");
-        MainTrackVo test4=(MainTrackVo)ajax.get("data");
-        System.out.println(test4.getDdxcpjsc()+"***************"+test4.getBugnum());
-        System.out.println("**********************************************************************************");
-
     }