Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	target/classes/main/resources/mapper/MouldEquipmentMapper.xml
#	target/classes/main/resources/mapper/MouldMapper.xml

cloud-model/src/main/java/com/hssx/cloudmodel/controller/MouldHistoryController.java

@@ -0,0 +1,44 @@
+package com.hssx.cloudmodel.controller;
+
+
+import com.hssx.cloudmodel.service.MouldHistoryService;
+import com.hssx.cloudmodel.util.HttpRespMsg;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-11
+ */
+@Controller
+@RequestMapping("/mouldhistory")
+public class MouldHistoryController {
+
+    @Autowired
+    private MouldHistoryService mouldHistoryService;
+
+    /**
+     *  获取云模盒的每日开合次数图标 (时间/次数)
+     * @param equipmentNo 设备编号
+     * @param time 时间点 如：2019-02-15
+     * @return
+     */
+    @ApiOperation("获取云模盒的每日开合次数图标 (时间/次数)")
+    @RequestMapping("/openingAndClosingTimesChart")
+    @ResponseBody
+    public HttpRespMsg openingAndClosingTimesChart(String equipmentNo,String time){
+        HttpRespMsg msg = mouldHistoryService.getOpeningAndClosingTimesChart(equipmentNo, time);
+        return msg;
+    }
+
+}
+

cloud-model/src/main/java/com/hssx/cloudmodel/entity/MouldHistory.java

@@ -0,0 +1,334 @@
+package com.hssx.cloudmodel.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-11
+ */
+public class MouldHistory extends Model<MouldHistory> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * sim卡号
+     */
+    @TableField("sim")
+    private String sim;
+
+    /**
+     * 模盒设备编号
+     */
+    @TableField("equipment_no")
+    private String equipmentNo;
+
+    /**
+     * 软件版本号
+     */
+    @TableField("version")
+    private String version;
+
+    /**
+     * 工作状态
+     */
+    @TableField("status")
+    private String status;
+
+    /**
+     * 经度
+     */
+    @TableField("lng")
+    private String lng;
+
+    /**
+     * 纬度
+     */
+    @TableField("lat")
+    private String lat;
+
+    /**
+     * GPRS基站定位LAC号
+     */
+    @TableField("gprs_lac")
+    private String gprsLac;
+
+    /**
+     * GPRS基站定位CI号
+     */
+    @TableField("gprs_ci")
+    private String gprsCi;
+
+    /**
+     * Wifi定位BSSID
+     */
+    @TableField("wifi_bbsid")
+    private String wifiBbsid;
+
+    /**
+     * 模盒内温度
+     */
+    @TableField("temperature")
+    private Integer temperature;
+
+    /**
+     * 电池电量
+     */
+    @TableField("battery")
+    private Integer battery;
+
+    /**
+     * 2G信号
+     */
+    @TableField("sig_2g")
+    private Integer sig2g;
+
+    /**
+     * NB信号
+     */
+    @TableField("sig_nb")
+    private Integer sigNb;
+
+    /**
+     * WIFI信号
+     */
+    @TableField("sig_wifi")
+    private Integer sigWifi;
+
+    /**
+     * 预留字段
+     */
+    @TableField("ext0")
+    private String ext0;
+
+    /**
+     * 报警类型
+     */
+    @TableField("alarm")
+    private Integer alarm;
+
+    /**
+     * 开合模总次数
+     */
+    @TableField("run_cnt")
+    private Integer runCnt;
+
+    /**
+     * CRC校验码
+     */
+    @TableField("crc_code")
+    private String crcCode;
+
+    /**
+     * 创建时间
+     */
+    @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime indate;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getSim() {
+        return sim;
+    }
+
+    public void setSim(String sim) {
+        this.sim = sim;
+    }
+
+    public String getEquipmentNo() {
+        return equipmentNo;
+    }
+
+    public void setEquipmentNo(String equipmentNo) {
+        this.equipmentNo = equipmentNo;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getLng() {
+        return lng;
+    }
+
+    public void setLng(String lng) {
+        this.lng = lng;
+    }
+
+    public String getLat() {
+        return lat;
+    }
+
+    public void setLat(String lat) {
+        this.lat = lat;
+    }
+
+    public String getGprsLac() {
+        return gprsLac;
+    }
+
+    public void setGprsLac(String gprsLac) {
+        this.gprsLac = gprsLac;
+    }
+
+    public String getGprsCi() {
+        return gprsCi;
+    }
+
+    public void setGprsCi(String gprsCi) {
+        this.gprsCi = gprsCi;
+    }
+
+    public String getWifiBbsid() {
+        return wifiBbsid;
+    }
+
+    public void setWifiBbsid(String wifiBbsid) {
+        this.wifiBbsid = wifiBbsid;
+    }
+
+    public Integer getTemperature() {
+        return temperature;
+    }
+
+    public void setTemperature(Integer temperature) {
+        this.temperature = temperature;
+    }
+
+    public Integer getBattery() {
+        return battery;
+    }
+
+    public void setBattery(Integer battery) {
+        this.battery = battery;
+    }
+
+    public Integer getSig2g() {
+        return sig2g;
+    }
+
+    public void setSig2g(Integer sig2g) {
+        this.sig2g = sig2g;
+    }
+
+    public Integer getSigNb() {
+        return sigNb;
+    }
+
+    public void setSigNb(Integer sigNb) {
+        this.sigNb = sigNb;
+    }
+
+    public Integer getSigWifi() {
+        return sigWifi;
+    }
+
+    public void setSigWifi(Integer sigWifi) {
+        this.sigWifi = sigWifi;
+    }
+
+    public String getExt0() {
+        return ext0;
+    }
+
+    public void setExt0(String ext0) {
+        this.ext0 = ext0;
+    }
+
+    public Integer getAlarm() {
+        return alarm;
+    }
+
+    public void setAlarm(Integer alarm) {
+        this.alarm = alarm;
+    }
+
+    public Integer getRunCnt() {
+        return runCnt;
+    }
+
+    public void setRunCnt(Integer runCnt) {
+        this.runCnt = runCnt;
+    }
+
+    public String getCrcCode() {
+        return crcCode;
+    }
+
+    public void setCrcCode(String crcCode) {
+        this.crcCode = crcCode;
+    }
+
+    public LocalDateTime getIndate() {
+        return indate;
+    }
+
+    public void setIndate(LocalDateTime indate) {
+        this.indate = indate;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "MouldHistory{" +
+        "id=" + id +
+        ", sim=" + sim +
+        ", equipmentNo=" + equipmentNo +
+        ", version=" + version +
+        ", status=" + status +
+        ", lng=" + lng +
+        ", lat=" + lat +
+        ", gprsLac=" + gprsLac +
+        ", gprsCi=" + gprsCi +
+        ", wifiBbsid=" + wifiBbsid +
+        ", temperature=" + temperature +
+        ", battery=" + battery +
+        ", sig2g=" + sig2g +
+        ", sigNb=" + sigNb +
+        ", sigWifi=" + sigWifi +
+        ", ext0=" + ext0 +
+        ", alarm=" + alarm +
+        ", runCnt=" + runCnt +
+        ", crcCode=" + crcCode +
+        ", indate=" + indate +
+        "}";
+    }
+}

cloud-model/src/main/java/com/hssx/cloudmodel/entity/vo/MouldHistoryVO.java

@@ -0,0 +1,15 @@
+package com.hssx.cloudmodel.entity.vo;
+
+import com.hssx.cloudmodel.entity.MouldHistory;
+import lombok.Data;
+
+/**
+ * Author: 吴涛涛 cuiyi@itany.com
+ * Date : 2019 - 10 - 11 17:10
+ * Description:<描述>
+ * Version: 1.0
+ */
+@Data
+public class MouldHistoryVO extends MouldHistory {
+    private String time;
+}

cloud-model/src/main/java/com/hssx/cloudmodel/mapper/MouldHistoryMapper.java

@@ -0,0 +1,21 @@
+package com.hssx.cloudmodel.mapper;
+
+import com.hssx.cloudmodel.entity.MouldHistory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hssx.cloudmodel.entity.vo.MouldHistoryVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-11
+ */
+public interface MouldHistoryMapper extends BaseMapper<MouldHistory> {
+
+    List<MouldHistoryVO> selectOpeningAndClosingTimesChart(@Param("equipmentNo") String equipmentNo, @Param("time") String time);
+}

cloud-model/src/main/java/com/hssx/cloudmodel/service/MouldHistoryService.java

@@ -0,0 +1,18 @@
+package com.hssx.cloudmodel.service;
+
+import com.hssx.cloudmodel.entity.MouldHistory;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hssx.cloudmodel.util.HttpRespMsg;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-11
+ */
+public interface MouldHistoryService extends IService<MouldHistory> {
+
+    HttpRespMsg getOpeningAndClosingTimesChart(String equipmentNo, String time);
+}

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldHistoryServiceImpl.java

@@ -0,0 +1,33 @@
+package com.hssx.cloudmodel.service.impl;
+
+import com.hssx.cloudmodel.entity.MouldHistory;
+import com.hssx.cloudmodel.entity.vo.MouldHistoryVO;
+import com.hssx.cloudmodel.mapper.MouldHistoryMapper;
+import com.hssx.cloudmodel.service.MouldHistoryService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hssx.cloudmodel.util.HttpRespMsg;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-11
+ */
+@Service
+public class MouldHistoryServiceImpl extends ServiceImpl<MouldHistoryMapper, MouldHistory> implements MouldHistoryService {
+    @Resource
+    private MouldHistoryMapper mouldHistoryMapper;
+    @Override
+    public HttpRespMsg getOpeningAndClosingTimesChart(String equipmentNo, String time) {
+        HttpRespMsg msg = new HttpRespMsg();
+       List<MouldHistoryVO> list =  mouldHistoryMapper.selectOpeningAndClosingTimesChart(equipmentNo,time);
+        msg.data=list;
+        return msg;
+    }
+}

cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java

@@ -204,12 +204,12 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("tb_mould_equipment");
+        strategy.setInclude("mould_history");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);
         //数据库表前缀，不配置这行的话，生成的类会带有T如:TUser,配置后即可将前缀去掉
-        strategy.setTablePrefix("tb_");
+//        strategy.setTablePrefix("tb_");
         mpg.setStrategy(strategy);
 //        mpg.setTemplateEngine(new FreemarkerTemplateEngine());
         mpg.execute();

cloud-model/src/main/resources/mapper/MouldHistoryMapper.xml

@@ -0,0 +1,63 @@
+<?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.hssx.cloudmodel.mapper.MouldHistoryMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.MouldHistory">
+        <id column="id" property="id" />
+        <result column="sim" property="sim" />
+        <result column="equipment_no" property="equipmentNo" />
+        <result column="version" property="version" />
+        <result column="status" property="status" />
+        <result column="lng" property="lng" />
+        <result column="lat" property="lat" />
+        <result column="gprs_lac" property="gprsLac" />
+        <result column="gprs_ci" property="gprsCi" />
+        <result column="wifi_bbsid" property="wifiBbsid" />
+        <result column="temperature" property="temperature" />
+        <result column="battery" property="battery" />
+        <result column="sig_2g" property="sig2g" />
+        <result column="sig_nb" property="sigNb" />
+        <result column="sig_wifi" property="sigWifi" />
+        <result column="ext0" property="ext0" />
+        <result column="alarm" property="alarm" />
+        <result column="run_cnt" property="runCnt" />
+        <result column="crc_code" property="crcCode" />
+        <result column="indate" property="indate" />
+    </resultMap>
+    <resultMap id="BaseResultMapVO" type="com.hssx.cloudmodel.entity.vo.MouldHistoryVO">
+        <id column="id" property="id" />
+        <result column="sim" property="sim" />
+        <result column="equipment_no" property="equipmentNo" />
+        <result column="version" property="version" />
+        <result column="status" property="status" />
+        <result column="lng" property="lng" />
+        <result column="lat" property="lat" />
+        <result column="gprs_lac" property="gprsLac" />
+        <result column="gprs_ci" property="gprsCi" />
+        <result column="wifi_bbsid" property="wifiBbsid" />
+        <result column="temperature" property="temperature" />
+        <result column="battery" property="battery" />
+        <result column="sig_2g" property="sig2g" />
+        <result column="sig_nb" property="sigNb" />
+        <result column="sig_wifi" property="sigWifi" />
+        <result column="ext0" property="ext0" />
+        <result column="alarm" property="alarm" />
+        <result column="run_cnt" property="runCnt" />
+        <result column="crc_code" property="crcCode" />
+        <result column="indate" property="indate" />
+        <result column="time" property="time" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, sim, equipment_no, version, status, lng, lat, gprs_lac, gprs_ci, wifi_bbsid, temperature, battery, sig_2g, sig_nb, sig_wifi, ext0, alarm, run_cnt, crc_code, indate
+    </sql>
+
+    <select id="selectOpeningAndClosingTimesChart" resultMap="BaseResultMapVO">
+      SELECT  DATE_FORMAT(indate,'%H:%i:%s') time ,  run_cnt FROM `mould_history`
+       WHERE `equipment_no`= #{equipmentNo} AND DATE_FORMAT(indate,'%Y-%m-%d') = #{time}
+       ORDER BY indate
+    </select>
+
+</mapper>