添加设备上线和下线的业务日志记录

device-manager/db/add.sql

@@ -38,3 +38,7 @@ ALTER TABLE mortals_xhx_device_alarm_info ADD COLUMN  `deviceName` varchar(256)
 ALTER TABLE mortals_xhx_device ADD COLUMN  `showSms` tinyint(2)    DEFAULT '1'  COMMENT '是否显示短信(0.否，1.是)' AFTER hallName;
 ALTER TABLE mortals_xhx_device ADD COLUMN  `showPrint` tinyint(2)    DEFAULT '1'  COMMENT '是否显示打印机(0.否，1.是)' AFTER showSms;
 ALTER TABLE mortals_xhx_device ADD COLUMN  `showWechatQrCode` tinyint(2)    DEFAULT '1'  COMMENT '是否显示小程序二维码(0.否，1.是)' AFTER showPrint;
+
+
+
+ALTER TABLE mortals_xhx_device ADD COLUMN  `orgName` varchar(128)      COMMENT '所属机构' AFTER showWechatQrCode;
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceEntity.java

@@ -212,6 +212,12 @@ public class DeviceEntity extends DeviceVo {
      * 是否显示小程序二维码(0.否，1.是)
      */
     private Integer showWechatQrCode;
+
+    /**
+     * 所属机构
+     */
+    private String orgName;
+
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -321,5 +327,7 @@ public class DeviceEntity extends DeviceVo {
         this.showPrint = 1;
 
         this.showWechatQrCode = 1;
+
+        this.orgName="";
     }
 }
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceQuery.java

@@ -7,7 +7,7 @@ import com.mortals.xhx.module.device.model.DeviceEntity;
  * 设备查询对象
  *
  * @author zxfei
- * @date 2023-05-11
+ * @date 2023-07-13
  */
 public class DeviceQuery extends DeviceEntity {
     /** 开始 主键ID，主键，自增长 */
@@ -480,6 +480,11 @@ public class DeviceQuery extends DeviceEntity {
     /** 是否显示小程序二维码(0.否，1.是)排除列表 */
     private List <Integer> showWechatQrCodeNotList;
 
+    /** 所属机构 */
+    private List<String> orgNameList;
+
+    /** 所属机构排除列表 */
+    private List <String> orgNameNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<DeviceQuery> orConditionList;
 
@@ -3149,6 +3154,38 @@ public class DeviceQuery extends DeviceEntity {
     }
 
 
+    /**
+     * 获取 所属机构
+     * @return orgNameList
+     */
+    public List<String> getOrgNameList(){
+        return this.orgNameList;
+    }
+
+    /**
+     * 设置 所属机构
+     * @param orgNameList
+     */
+    public void setOrgNameList(List<String> orgNameList){
+        this.orgNameList = orgNameList;
+    }
+
+    /**
+     * 获取 所属机构
+     * @return orgNameNotList
+     */
+    public List<String> getOrgNameNotList(){
+        return this.orgNameNotList;
+    }
+
+    /**
+     * 设置 所属机构
+     * @param orgNameNotList
+     */
+    public void setOrgNameNotList(List<String> orgNameNotList){
+        this.orgNameNotList = orgNameNotList;
+    }
+
     /**
      * 设置  主键ID，主键，自增长
      * @param id
@@ -4763,6 +4800,25 @@ public class DeviceQuery extends DeviceEntity {
         return this;
     }
 
+
+    /**
+     * 设置 所属机构
+     * @param orgName
+     */
+    public DeviceQuery orgName(String orgName){
+        setOrgName(orgName);
+        return this;
+    }
+
+    /**
+     * 设置 所属机构
+     * @param orgNameList
+     */
+    public DeviceQuery orgNameList(List<String> orgNameList){
+        this.orgNameList = orgNameList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

device-manager/src/main/resources/sqlmap/module/device/DeviceMapper.xml

@@ -56,6 +56,7 @@
         <result property="showSms" column="showSms" />
         <result property="showPrint" column="showPrint" />
         <result property="showWechatQrCode" column="showWechatQrCode" />
+        <result property="orgName" column="orgName" />
 
     </resultMap>
 
@@ -216,23 +217,26 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('showWechatQrCode') or colPickMode == 1 and data.containsKey('showWechatQrCode')))">
                 a.showWechatQrCode,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('orgName') or colPickMode == 1 and data.containsKey('orgName')))">
+                a.orgName,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="DeviceEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_device
-        (deviceName,deviceCode,deviceMac,siteId,siteCode,siteName,platformId,platformName,productId,productName,skinId,skinName,homeUrl,deviceFirmId,deviceFirmname,deviceSrc,deviceDataSourceWay,lon,lati,deviceInBuilding,deviceInFloor,defectsLiabilityPeriod,leadingOfficial,leadingOfficialTelephone,isReceiveMess,devicePhotoPath,ip,centernum,port,deviceTopic,deviceStatus,enabled,deviceAuthCode,deviceRemark,onlineTime,offlineTime,deleted,source,createUserId,createTime,updateUserId,updateTime,deviceSN,deviceVersion,productCode,hallId,hallName,showSms,showPrint,showWechatQrCode)
+        (deviceName,deviceCode,deviceMac,siteId,siteCode,siteName,platformId,platformName,productId,productName,skinId,skinName,homeUrl,deviceFirmId,deviceFirmname,deviceSrc,deviceDataSourceWay,lon,lati,deviceInBuilding,deviceInFloor,defectsLiabilityPeriod,leadingOfficial,leadingOfficialTelephone,isReceiveMess,devicePhotoPath,ip,centernum,port,deviceTopic,deviceStatus,enabled,deviceAuthCode,deviceRemark,onlineTime,offlineTime,deleted,source,createUserId,createTime,updateUserId,updateTime,deviceSN,deviceVersion,productCode,hallId,hallName,showSms,showPrint,showWechatQrCode,orgName)
         VALUES
-        (#{deviceName},#{deviceCode},#{deviceMac},#{siteId},#{siteCode},#{siteName},#{platformId},#{platformName},#{productId},#{productName},#{skinId},#{skinName},#{homeUrl},#{deviceFirmId},#{deviceFirmname},#{deviceSrc},#{deviceDataSourceWay},#{lon},#{lati},#{deviceInBuilding},#{deviceInFloor},#{defectsLiabilityPeriod},#{leadingOfficial},#{leadingOfficialTelephone},#{isReceiveMess},#{devicePhotoPath},#{ip},#{centernum},#{port},#{deviceTopic},#{deviceStatus},#{enabled},#{deviceAuthCode},#{deviceRemark},#{onlineTime},#{offlineTime},#{deleted},#{source},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{deviceSN},#{deviceVersion},#{productCode},#{hallId},#{hallName},#{showSms},#{showPrint},#{showWechatQrCode})
+        (#{deviceName},#{deviceCode},#{deviceMac},#{siteId},#{siteCode},#{siteName},#{platformId},#{platformName},#{productId},#{productName},#{skinId},#{skinName},#{homeUrl},#{deviceFirmId},#{deviceFirmname},#{deviceSrc},#{deviceDataSourceWay},#{lon},#{lati},#{deviceInBuilding},#{deviceInFloor},#{defectsLiabilityPeriod},#{leadingOfficial},#{leadingOfficialTelephone},#{isReceiveMess},#{devicePhotoPath},#{ip},#{centernum},#{port},#{deviceTopic},#{deviceStatus},#{enabled},#{deviceAuthCode},#{deviceRemark},#{onlineTime},#{offlineTime},#{deleted},#{source},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{deviceSN},#{deviceVersion},#{productCode},#{hallId},#{hallName},#{showSms},#{showPrint},#{showWechatQrCode},#{orgName})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_device
-        (deviceName,deviceCode,deviceMac,siteId,siteCode,siteName,platformId,platformName,productId,productName,skinId,skinName,homeUrl,deviceFirmId,deviceFirmname,deviceSrc,deviceDataSourceWay,lon,lati,deviceInBuilding,deviceInFloor,defectsLiabilityPeriod,leadingOfficial,leadingOfficialTelephone,isReceiveMess,devicePhotoPath,ip,centernum,port,deviceTopic,deviceStatus,enabled,deviceAuthCode,deviceRemark,onlineTime,offlineTime,deleted,source,createUserId,createTime,updateUserId,updateTime,deviceSN,deviceVersion,productCode,hallId,hallName,showSms,showPrint,showWechatQrCode)
+        (deviceName,deviceCode,deviceMac,siteId,siteCode,siteName,platformId,platformName,productId,productName,skinId,skinName,homeUrl,deviceFirmId,deviceFirmname,deviceSrc,deviceDataSourceWay,lon,lati,deviceInBuilding,deviceInFloor,defectsLiabilityPeriod,leadingOfficial,leadingOfficialTelephone,isReceiveMess,devicePhotoPath,ip,centernum,port,deviceTopic,deviceStatus,enabled,deviceAuthCode,deviceRemark,onlineTime,offlineTime,deleted,source,createUserId,createTime,updateUserId,updateTime,deviceSN,deviceVersion,productCode,hallId,hallName,showSms,showPrint,showWechatQrCode,orgName)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.deviceName},#{item.deviceCode},#{item.deviceMac},#{item.siteId},#{item.siteCode},#{item.siteName},#{item.platformId},#{item.platformName},#{item.productId},#{item.productName},#{item.skinId},#{item.skinName},#{item.homeUrl},#{item.deviceFirmId},#{item.deviceFirmname},#{item.deviceSrc},#{item.deviceDataSourceWay},#{item.lon},#{item.lati},#{item.deviceInBuilding},#{item.deviceInFloor},#{item.defectsLiabilityPeriod},#{item.leadingOfficial},#{item.leadingOfficialTelephone},#{item.isReceiveMess},#{item.devicePhotoPath},#{item.ip},#{item.centernum},#{item.port},#{item.deviceTopic},#{item.deviceStatus},#{item.enabled},#{item.deviceAuthCode},#{item.deviceRemark},#{item.onlineTime},#{item.offlineTime},#{item.deleted},#{item.source},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.deviceSN},#{item.deviceVersion},#{item.productCode},#{item.hallId},#{item.hallName},#{item.showSms},#{item.showPrint},#{item.showWechatQrCode})
+            (#{item.deviceName},#{item.deviceCode},#{item.deviceMac},#{item.siteId},#{item.siteCode},#{item.siteName},#{item.platformId},#{item.platformName},#{item.productId},#{item.productName},#{item.skinId},#{item.skinName},#{item.homeUrl},#{item.deviceFirmId},#{item.deviceFirmname},#{item.deviceSrc},#{item.deviceDataSourceWay},#{item.lon},#{item.lati},#{item.deviceInBuilding},#{item.deviceInFloor},#{item.defectsLiabilityPeriod},#{item.leadingOfficial},#{item.leadingOfficialTelephone},#{item.isReceiveMess},#{item.devicePhotoPath},#{item.ip},#{item.centernum},#{item.port},#{item.deviceTopic},#{item.deviceStatus},#{item.enabled},#{item.deviceAuthCode},#{item.deviceRemark},#{item.onlineTime},#{item.offlineTime},#{item.deleted},#{item.source},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.deviceSN},#{item.deviceVersion},#{item.productCode},#{item.hallId},#{item.hallName},#{item.showSms},#{item.showPrint},#{item.showWechatQrCode},#{item.orgName})
         </foreach>
     </insert>
 
@@ -452,6 +456,9 @@
             <if test="(colPickMode==0 and data.containsKey('showWechatQrCodeIncrement')) or (colPickMode==1 and !data.containsKey('showWechatQrCodeIncrement'))">
                 a.showWechatQrCode=ifnull(a.showWechatQrCode,0) + #{data.showWechatQrCodeIncrement},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('orgName')) or (colPickMode==1 and !data.containsKey('orgName'))">
+                a.orgName=#{data.orgName},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -914,6 +921,13 @@
                     </choose>
                 </foreach>
             </trim>
+            <trim prefix="orgName=(case" suffix="ELSE orgName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('orgName')) or (colPickMode==1 and !item.containsKey('orgName'))">
+                        when a.id=#{item.id} then #{item.orgName}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -2197,6 +2211,27 @@
             ${_conditionType_} a.showWechatQrCode <![CDATA[ <= ]]> #{${_conditionParam_}.showWechatQrCodeEnd}
         </if>
 
+
+        <if test="conditionParamRef.containsKey('orgName')">
+            <if test="conditionParamRef.orgName != null and conditionParamRef.orgName != ''">
+                ${_conditionType_} a.orgName like #{${_conditionParam_}.orgName}
+            </if>
+            <if test="conditionParamRef.orgName == null">
+                ${_conditionType_} a.orgName is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('orgNameList') and conditionParamRef.orgNameList.size() > 0">
+            ${_conditionType_} a.orgName in
+            <foreach collection="conditionParamRef.orgNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('orgNameNotList') and conditionParamRef.orgNameNotList.size() > 0">
+            ${_conditionType_} a.orgName not in
+            <foreach collection="conditionParamRef.orgNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -2465,6 +2500,11 @@
                     <if test='orderCol.showWechatQrCode != null and "DESC".equalsIgnoreCase(orderCol.showWechatQrCode)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('orgName')">
+                    a.orgName
+                    <if test='orderCol.orgName != null and "DESC".equalsIgnoreCase(orderCol.orgName)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
     </sql>