查询厕所格子

src/main/java/com/shawn/model/Bean/CommonParamVo.java

@@ -0,0 +1,30 @@
+package com.shawn.model.Bean;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Accessors(chain = true)
+@NoArgsConstructor
+@Getter
+@Setter
+@ToString
+public class CommonParamVo {
+    private String name;
+    /**
+     * 参数值
+     */
+    private String val;
+
+    private List<CommonParamVo> commonParamVos;
+
+    private String id;
+
+    private String code;
+
+    private String clientId;
+}

src/main/java/com/shawn/model/entity/TBox.java

@@ -0,0 +1,75 @@
+package com.shawn.model.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Accessors(chain = true)
+@NoArgsConstructor
+@Getter
+@Setter
+@ToString
+public class TBox {
+    
+	@ApiModelProperty(value="id")
+	private Long id;
+
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value="添加时间")
+	private Date createDate;
+
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value="修改时间")
+	private Date modifyDate;
+
+	/**
+	 * 厕所编号
+	 */
+	@ApiModelProperty(value="厕所编号")
+	private String sn;
+
+	/**
+	 *
+	 */
+	@ApiModelProperty(value="")
+	private String adminId;
+
+	/**
+	 *
+	 */
+	@ApiModelProperty(value="")
+	private String equipmentId;
+
+	/**
+	 * 状态  0:无人使用 1：正在使用 2：正在清洗
+	 */
+	@ApiModelProperty(value="状态  0:无人使用 1：正在使用 2：正在清洗")
+	private String status;
+
+	/**自定义统一方法设置主键**/
+	public void setPrimaryKey(Long primaryKey) {
+		 setId(primaryKey);
+	}
+
+	/**自定义统一方法获取主键**/
+	@JsonIgnore
+	public Long getPrimaryKey() {
+		 return getId();
+	}
+
+	/**判断该实体是否存在主键**/
+	public boolean hasPrimaryKey() {
+		return true;
+	}
+
+}

src/main/java/com/shawn/repository/TEquipmentMapper.java

@@ -5,6 +5,7 @@
 
 package com.shawn.repository;
 
+import com.shawn.model.entity.TBox;
 import com.shawn.model.entity.TEquipment;
 import com.shawn.model.entity.TEquipmentExample;
 import com.shawn.model.param.StatisticsParam;
@@ -23,4 +24,6 @@ public interface TEquipmentMapper extends BaseDaoInterface<TEquipment,TEquipment
     List<TEquipment> findByArea(Long id);
 
     List<TEquipment> findByAdmin(Long adminId);
+
+    List<TBox> getBoxs(String equipmentId);
 }

src/main/java/com/shawn/service/impl/TEquipmentServiceImpl.java

@@ -5,6 +5,7 @@
 
 package com.shawn.service.impl;
 
+import com.shawn.model.entity.TBox;
 import com.shawn.model.param.StatisticsParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -15,6 +16,9 @@ import com.shawn.model.param.TEquipmentParam;
 import com.shawn.repository.TEquipmentMapper;
 import com.shawn.service.base.BaseService;
 import com.shawn.service.interfac.TEquipmentServiceInterface;
+
+import java.util.List;
+
 @Service
 public class TEquipmentServiceImpl extends BaseService<TEquipment,TEquipmentExample,TEquipmentParam,Long> implements TEquipmentServiceInterface{
 	@Autowired
@@ -38,4 +42,9 @@ public class TEquipmentServiceImpl extends BaseService<TEquipment,TEquipmentExam
 	public String findMachineUseNum(StatisticsParam param) {
 		return tEquipmentMapper.findMachineUseNum(param);
 	}
+
+	@Override
+	public List<TBox> getBoxs(String equipmentId) {
+		return tEquipmentMapper.getBoxs(equipmentId);
+	}
 }

src/main/java/com/shawn/service/interfac/TEquipmentServiceInterface.java

@@ -5,14 +5,19 @@
 
 package com.shawn.service.interfac;
 
+import com.shawn.model.entity.TBox;
 import com.shawn.model.entity.TEquipment;
 import com.shawn.model.entity.TEquipmentExample;
 import com.shawn.model.param.StatisticsParam;
 import com.shawn.model.param.TEquipmentParam;
 import com.shawn.service.base.BaseServiceInterface;
 
+import java.util.List;
+
 public interface TEquipmentServiceInterface extends BaseServiceInterface<TEquipment,TEquipmentExample,TEquipmentParam,Long>{
     public String findMachineTotalNum(StatisticsParam param);
 
     public String findMachineUseNum(StatisticsParam param);
+
+    public List<TBox> getBoxs(String equipmentId);
 }

src/main/java/com/shawn/util/PushUtils.java

@@ -17,11 +17,14 @@ import java.util.List;
 public class PushUtils {
 
 
-    public final static String appId = "GKa6qa12heALjEXZlAn1U3";
+    //    public final static String appId = "GKa6qa12heALjEXZlAn1U3";
+    public final static String appId = "n4vsaIAi0eAbAkfBfqsUL7";
 
-    public final static String appKey = "fLvPjR8hni7VFMkgjh8lx2";
+    //    public final static String appKey = "fLvPjR8hni7VFMkgjh8lx2";
+    public final static String appKey = "iUQlj7YC4c5Zb7CSuwQTP4";
 
-    public final static String masterSecret = "KjxrC6vTLr5wiZu55cCnS8";
+    public final static String masterSecret = "2M5oeptE8kAfSYcPXpR7r6";
+//    public final static String masterSecret = "KjxrC6vTLr5wiZu55cCnS8";
 
     public final static String host = "http://sdk.open.api.igexin.com/apiex.htm";
 

src/main/java/com/shawn/web/controller/TEquipmentController.java

@@ -12,10 +12,8 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import com.shawn.model.Bean.Child;
-import com.shawn.model.Bean.Childlast;
-import com.shawn.model.Bean.Children2;
-import com.shawn.model.Bean.Children3;
+import com.gexin.fastjson.JSON;
+import com.shawn.model.Bean.*;
 import com.shawn.model.dto.TAdminDTO;
 import com.shawn.model.dto.TEquipmentDTO;
 import com.shawn.model.entity.*;
@@ -27,6 +25,7 @@ import com.shawn.repository.TOrderMapper;
 import com.shawn.service.interfac.*;
 import com.shawn.util.BeanUtils;
 import com.shawn.util.PushUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -733,5 +732,74 @@ public class TEquipmentController extends BaseController<TEquipment, TEquipmentE
         map.put("sundayDate", weekEnd);
         return map;
     }
+    /**
+     * 推送设备共同以及/设备参数
+     *
+     * @param
+     * @return
+     */
+    @PostMapping("/updateParameters")
+    public ResponseEntity<?> updateCommonParam(@RequestBody CommonParamVo commonParamVo) {
+        String equipmentId = commonParamVo.getId();
+        TEquipment equipment = tEquipmentService.selectEntityById(Long.valueOf(equipmentId));
+        PushUtils.push(equipment.getGtClientId(), "", "", PushUtils.buildJson("Param", commonParamVo.getName() + ":" + commonParamVo.getVal()).toString());
 
+        return ResponseEntity
+                .status(HttpStatus.OK)
+                .body(new ResultMessage()
+                        .setCode(true)
+                        .setData("SUCCESS")
+                        .setMessage("SUCCESS"));
+    }
+    /**
+     * 获取设备参数
+     *
+     * @param
+     * @return
+     */
+    @PostMapping("/getParameters")
+    public ResponseEntity<?> getParameters(@RequestBody CommonParamVo commonParamVo) {
+        String equipmentId = commonParamVo.getId();
+        String code = commonParamVo.getCode();
+        String name = commonParamVo.getName();
+        TEquipment equipment = tEquipmentService.selectEntityById(Long.valueOf(equipmentId));
+        List<CommonParamVo> commonParamVos = null;
+        String commonParameters = equipment.getCommonParameters();
+        String advancedParameters = equipment.getAdvancedParameters();
+//        if (StringUtils.isEmpty(commonParameters) || StringUtils.isEmpty(advancedParameters)) {
+        if (StringUtils.isEmpty(advancedParameters)) {
+            return null;
+        }
+        if (code.equals("0")) {
+            commonParamVos = JSON.parseArray(commonParameters, CommonParamVo.class);
+
+        } else {
+
+            commonParamVos = JSON.parseArray(advancedParameters, CommonParamVo.class);
+        }
+//        for (CommonParamVo commonParam : commonParamVos) {
+//            if (commonParam.getName().equals(name)) {
+//                 commonParam.getVal();
+//            }
+//        }
+        return ResponseEntity
+                .status(HttpStatus.OK)
+                .body(new ResultMessage()
+                        .setCode(true)
+                        .setData(commonParamVos)
+                        .setMessage("SUCCESS"));
+    }
+
+    //获取厕所使用情况
+    @PostMapping("/getBoxs")
+    public ResponseEntity<?> getBoxs(@RequestBody StatisticsParam param) {
+        String equipmentId = param.getEquipmentId();
+        List<TBox> boxs = tEquipmentService.getBoxs(equipmentId);
+        return ResponseEntity
+                .status(HttpStatus.OK)
+                .body(new ResultMessage()
+                        .setCode(true)
+                        .setData(boxs)
+                        .setMessage("SUCCESS"));
+    }
 }

src/main/resources/com/shawn/repository/mybatis/TEquipmentMapper.xml

@@ -1305,4 +1305,11 @@
     from t_equipment
     where admin_id = #{adminId,jdbcType=BIGINT}
   </select>
+  <!-- 获取厕所格子数量状态-->
+  <select id="getBoxs" parameterType="java.lang.String" resultType="com.shawn.model.entity.TBox">
+    SELECT * FROM
+    t_box a
+    where a.equipment_id = #{equipmentId}
+
+  </select>
 </mapper>