Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/dao/entity/Point.java

@@ -268,9 +268,15 @@ public class Point extends BasicEntity {
 	private String riskSourceId;
 
 	/**
+	 * 所在建筑Id
+	 */
+	@Column(name="building_id")
+	private String buildingId;
+
+	/**
 	 * 所在建筑名称
 	 */
-//	@Column(name="building_name")
+	@Column(name="building_name")
 	private String buildingName;
 
 	public String getBuildingName() {
@@ -290,12 +296,6 @@ public class Point extends BasicEntity {
 	}
 
 	/**
-	 * 所在建筑Id
-	 */
-//	@Column(name="building_id")
-	private String buildingId;
-
-	/**
 	 * ue4位置
 	 */
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/CheckServiceImpl.java

@@ -1156,7 +1156,6 @@ public class CheckServiceImpl implements ICheckService {
         if (total == 0) {
             return new PageImpl<>(content, page, total);
         }
-        ;
         map.put("status", PlanTaskFinishStatusEnum.getValue(String.valueOf(map.get("status"))));
         map.put("offset", page.getOffset());
         map.put("pageSize", page.getPageSize());

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PointServiceImpl.java

@@ -1134,6 +1134,11 @@ public class PointServiceImpl implements IPointService {
         List<Long> ids = new ArrayList<Long>();
         Point point = new Point();
         String id = StringUtil.isNotEmpty(orgUsrFormDto.getSequenceNbr()) ? String.valueOf(orgUsrFormDto.getSequenceNbr()) : String.valueOf(sequence.nextId());
+        point.setPointNo(id);
+        point.setShotMinNumber(0);
+        point.setShotMaxNumber(0);
+        point.setFixedShot(0);
+        point.setLevel("");
         point.setName(orgUsrFormDto.getBizOrgName());
         point.setOrgCode(orgUsrFormDto.getBizOrgCode());
         point.setBuildingId(orgUsrFormDto.getBuildId());
@@ -1156,7 +1161,7 @@ public class PointServiceImpl implements IPointService {
                 }
             }
         }
-        point.setOrgCode(orgUsrFormDto.getAmosOrgCode());
+        point.setOrgCode(StringUtil.isNotEmpty(orgUsrFormDto.getAmosOrgCode()) ? orgUsrFormDto.getAmosOrgCode() : "");
         Long pointId = iPointDao.findPointByEquipmentIdAndFireFacilityId(id, point.getOriginalId());
         if (null != pointId) {
             ids.add(pointId);

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/util/InputItemParamUtil.java

 package com.yeejoin.amos.supervision.business.util;
 
+import java.sql.PreparedStatement;
 import java.util.HashMap;
 import java.util.List;
 
@@ -62,6 +63,7 @@ public class InputItemParamUtil {
         }
         param.setOrgCode(perMap.get("orgCode").toString());
         if (commonPageable != null) {
+            param.setOffset(Integer.parseInt(String.valueOf(commonPageable.getOffset())));
             param.setPageNumber(commonPageable.getPageNumber());
             param.setPageSize(commonPageable.getPageSize());
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/mqtt/AmosMqttListener.java

 package com.yeejoin.amos.supervision.mqtt;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.supervision.business.dto.OrgUsrFormDto;
 import com.yeejoin.amos.supervision.business.service.intfc.IPointService;
 import lombok.extern.slf4j.Slf4j;
+import net.sf.json.JSONObject;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.typroject.tyboot.component.emq.EmqxListener;
 
+import java.nio.charset.Charset;
+
 /**
  * @author keyong
  * @title: AmosMqttListener
@@ -27,12 +29,13 @@ public class AmosMqttListener extends EmqxListener {
 
     @Override
     public void processMessage(String topic, MqttMessage message) {
-        String msg = String.valueOf(message);
+        byte[] payload = message.getPayload();
+        String str = new String(payload, Charset.forName("GBK"));
         if ("jcs/company/topic/add".equals(topic)) {
-            OrgUsrFormDto usrFormDto = JSON.parseObject(msg, OrgUsrFormDto.class);
+            OrgUsrFormDto usrFormDto = JSON.parseObject(str, OrgUsrFormDto.class);
             iPointService.syncSavePoint(usrFormDto);
         } else {
-            iPointService.delPointByPointNo(Long.valueOf(msg));
+            iPointService.delPointByPointNo(Long.valueOf(str));
         }
         try {
         } catch (Exception e) {

amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -1946,7 +1946,7 @@
             <if test="companyName != null and companyName != ''">
                 AND pc.company_name = #{company_name}
             </if>
-        LIMIT limit #{offset},#{pageSize}
+        limit #{offset},#{pageSize}
     </select>
 
     <select id="getPlanExecuteTeams" resultType="Map">

amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_input_item.xml

@@ -123,9 +123,9 @@
 		<if test="itemClassify != null"> and a.item_classify = #{itemClassify}</if>
 		order by a.id desc
 		<choose>
-	     <when test="pageSize==-1"></when>
-	     <when test="pageSize!=-1">limit #{offset},#{pageSize}</when>
-	    </choose>
+			<when test="pageSize==-1"></when>
+			<when test="pageSize!=-1">limit #{offset},#{pageSize}</when>
+		</choose>
 	</select>
 
 	<select id="getInputItemListByNames" resultMap="inputItemMap" parameterType="String">