fix:修改设备事件代码

src/main/java/com/pub/util/MqttUtil.java

@@ -15,18 +15,14 @@ import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
 import com.admin.dev.DevVO;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.aliyun.dingtalkservice_group_1_0.models.TopicStatisticsHeaders;
 import com.pub.jdbc.BaseDAO;
 import com.pub.listener.SpringContext;
 import com.pub.log.Log;
-import com.wxxcx.share.ShareVO;
-import com.wxxcx.target.TargetVO;
-import com.wxxcx.target.EventListVO;
+import com.wxxcx.targets.TargetVO;
+import com.wxxcx.targets.EventListVO;
 import com.wxxcx.user.MiniUserVO;
 import com.wxxcx.ws.PushMsgWebSocket;
 
-import oracle.net.aso.l;
-
 public class MqttUtil {
 //    private static String HOST = "tcp://119.45.12.173:1883";
     //	测试websocket

src/main/java/com/wxxcx/index/WxxcxIndexController.java

@@ -2,26 +2,18 @@ package com.wxxcx.index;
 
 import java.io.*;
 import java.math.BigDecimal;
-import java.net.HttpURLConnection;
-import java.net.URL;
 import java.security.MessageDigest;
 import java.sql.Timestamp;
 import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeParseException;
 import java.util.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
 import com.admin.alarm_event.AlarmEvent;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.StringUtils;
@@ -49,7 +41,7 @@ import com.admin.areaBase.Base;
 import com.wxxcx.room.DevRoomVO;
 import com.wxxcx.room.RoomVO;
 import com.wxxcx.share.ShareVO;
-import com.wxxcx.target.TargetVO;
+import com.wxxcx.targets.TargetVO;
 import com.wxxcx.user.MiniUserVO;
 
 import com.alibaba.fastjson.JSON;

src/main/java/com/wxxcx/targets/EventListVO.java

@@ -0,0 +1,61 @@
+package com.wxxcx.targets;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.pub.jdbc.CascadeMetadata;
+import com.pub.jdbc.SuperVO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.sql.Timestamp;
+
+@Data
+public class EventListVO extends SuperVO{
+
+	@ApiModelProperty(value = "id")
+	private int id;
+	@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty(value = "创建时间")
+	private Timestamp create_time;
+	@ApiModelProperty(value = "删除标记")
+	private int delete_tag ;
+	@ApiModelProperty(value = "删除时间")
+	private Timestamp delete_time;
+	@ApiModelProperty(value = "更新时间")
+	private Timestamp update_time;
+	@ApiModelProperty(value = "设备id")
+	private String dev_id;
+	@ApiModelProperty(value = "姿态")
+	private int pose;
+	@ApiModelProperty(value = "修正姿态")
+	private int pose_fix;
+	@ApiModelProperty(value = "target数组")
+	private String target_points;
+	@ApiModelProperty(value = "事件类型")
+	private int event;
+	@ApiModelProperty(value = "是否处理")
+	private int is_handle;
+	/**
+	 * 获取表名
+	 */
+	@Override
+	public String getTableName() {
+		return "event_list";
+	}
+	
+	/**
+	 * 获得关联子表的CascadeMetadata,没有直接null
+	 */
+	@Override
+	public CascadeMetadata[] getChildCascadeMetadata() {
+		return null;
+	}
+
+	/**
+	 * 获取主键
+	 */
+	@Override
+	public String getPKFieldName() {
+		return "id";
+	}
+	
+}

src/main/java/com/wxxcx/targets/TargetController.java

@@ -0,0 +1,76 @@
+package com.wxxcx.targets;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.pub.log.Log;
+import com.pub.page.Page;
+import com.pub.page.PageRecord;
+import com.pub.util.JSONUtil;
+import com.pub.util.R;
+import com.pub.util.SQLUtil;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import springfox.documentation.annotations.ApiIgnore;
+
+@Controller
+@RequestMapping("/Target")
+@Api(tags = "设备分享")
+public class TargetController {
+	
+	@Autowired
+	private TargetService targetService;
+	
+	@ResponseBody
+	@GetMapping("/getTargetByDevID")
+	@ApiOperation(value = "查询target记录")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name ="dev_id",value="设备ID",dataType = "String",paramType = "query")
+	})
+	public R getTargetByDevID(@ApiIgnore TargetVO vo) {
+		R r =JSONUtil.getSuccessMsg(null);
+		TargetVO target =targetService.getTargetByDevID(vo);
+		r.data.put("target", target);
+		return r;
+	}
+	
+	@ResponseBody
+	@GetMapping("/queryTargetList")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "id", value = "主键（查询唯一记录）", dataType = "String", paramType = "query"),
+        @ApiImplicitParam(name = "page", value = "页码", dataType = "int", required = true, paramType = "query"),
+        @ApiImplicitParam(name = "rows", value = "每页条数", dataType = "int", required = true, paramType = "query"),
+        @ApiImplicitParam(name = "sort", value = "排序字段", dataType = "String", paramType = "query"),
+        @ApiImplicitParam(name = "order", value = "排序方式", dataType = "String", paramType = "query"),
+	})
+	public R queryTargetList(@ApiIgnore Page page,@ApiIgnore TargetVO vo) {
+		R r =JSONUtil.getSuccessMsg(null);
+		StringBuffer condition =SQLUtil.getCondition(vo);
+		PageRecord<TargetVO> pr =targetService.queryTargetList(page, condition);
+		r.data.put("pr", pr);
+		return r;
+	}
+	
+	@ResponseBody
+	@PostMapping("/saveOrUpdate")
+	@ApiOperation(value = "保存或更新设备")
+	@ApiImplicitParam(name = "设备实体对象", value = "对应表：dev_target", required = true, dataType = "TargetVO")
+	public R saveOrUpdate(@ApiIgnore @RequestBody TargetVO vo) {
+		R map =JSONUtil.getSuccessMsg("操作成功");
+		try {
+			targetService.saveOrUpdate(vo);
+		} catch (Exception ex) {
+			Log.error(ex);
+			map =JSONUtil.getErrorMsg(ex);
+		}
+		return map;
+	}
+}

src/main/java/com/wxxcx/targets/TargetService.java

@@ -0,0 +1,33 @@
+package com.wxxcx.targets;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import com.pub.jdbc.BaseDAO;
+import com.pub.page.Page;
+import com.pub.page.PageRecord;
+
+@Service
+public class TargetService {
+
+	@Autowired
+	private BaseDAO baseDAO;
+	
+	public PageRecord<TargetVO> queryTargetList(Page page,StringBuffer condition){
+		if(StringUtils.isEmpty(page.getSort())) {
+			page.setSort("create_time");
+			page.setOrder("desc");
+		}
+		return baseDAO.queryPaginateByCondition(TargetVO.class, condition.toString(), 
+				page.getRows(), page.getPage(),page.getSort()+" "+page.getOrder());
+	}
+	
+	public TargetVO getTargetByDevID(TargetVO vo) {
+		return baseDAO.queryByKey(vo.getClass(), "dev_id", vo.getDev_id());
+	}
+	
+	public void saveOrUpdate(TargetVO vo) {
+		baseDAO.insertAll(vo);
+	}
+}

src/main/java/com/wxxcx/targets/TargetVO.java

@@ -0,0 +1,61 @@
+package com.wxxcx.targets;
+
+import java.sql.Timestamp;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.pub.jdbc.CascadeMetadata;
+import com.pub.jdbc.SuperVO;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TargetVO extends SuperVO{
+
+	@ApiModelProperty(value = "id")
+	private int id;
+	@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty(value = "创建时间")
+	private Timestamp create_time;
+	@ApiModelProperty(value = "删除标记")
+	private int delete_tag ;
+	@ApiModelProperty(value = "删除时间")
+	private Timestamp delete_time;
+	@ApiModelProperty(value = "更新时间")
+	private Timestamp update_time;
+	@ApiModelProperty(value = "设备id")
+	private String dev_id;
+	@ApiModelProperty(value = "姿态")
+	private int pose;
+	@ApiModelProperty(value = "修正姿态")
+	private int pose_fix;
+	@ApiModelProperty(value = "target数组")
+	private String target_points;
+	@ApiModelProperty(value = "事件类型")
+	private int event;
+	@ApiModelProperty(value = "是否处理")
+	private int is_handle;
+	/**
+	 * 获取表名
+	 */
+	@Override
+	public String getTableName() {
+		return "dev_target";
+	}
+	
+	/**
+	 * 获得关联子表的CascadeMetadata,没有直接null
+	 */
+	@Override
+	public CascadeMetadata[] getChildCascadeMetadata() {
+		return null;
+	}
+
+	/**
+	 * 获取主键
+	 */
+	@Override
+	public String getPKFieldName() {
+		return "id";
+	}
+	
+}