Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/db/add.sql

@@ -159,7 +159,7 @@ PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备应用黑名单';
 
 -- ----------------------------
-2023-5-07
+-- 2023-5-07
 -- ----------------------------
 ALTER TABLE mortals_sys_site ADD COLUMN `onlineTake` tinyint(2)    DEFAULT '1'  COMMENT '在线取号（0.否，1.是）' AFTER workday7;
 ALTER TABLE mortals_sys_site ADD COLUMN `appointment` tinyint(2)    DEFAULT '1'  COMMENT '在线取号（0.否，1.是）' AFTER onlineTake;
@@ -167,7 +167,7 @@ ALTER TABLE mortals_sys_site ADD COLUMN `gowMap` tinyint(2)    DEFAULT '1'  COMM
 
 
 -- ----------------------------
-2023-6-15
+-- 2023-6-15
 -- ----------------------------
 -- ----------------------------
 -- 自助终端应用分类表
@@ -189,20 +189,20 @@ PRIMARY KEY  (`id`)
 
 
 -- ----------------------------
-2023-7-05
+-- 2023-7-05
 -- ----------------------------
 
 ALTER TABLE mortals_sys_app_category ADD COLUMN `cover`  varchar(256)  DEFAULT ''   COMMENT '封面' AFTER sort;
 ALTER TABLE mortals_sys_app_category ADD COLUMN `remark`  varchar(256)  DEFAULT ''   COMMENT '备注' AFTER cover;
 
 -- ----------------------------
-2023-08-29
+-- 2023-08-29
 -- ----------------------------
 ALTER TABLE `mortals_sys_model` ADD COLUMN `type` tinyint(2)  DEFAULT '1'  COMMENT '模块分类' AFTER `sort`;
 
 
 -- ----------------------------
-2023-9-11
+-- 2023-9-11
 -- ----------------------------
 ALTER TABLE mortals_sys_app_info_field ADD COLUMN  `serviceApi` varchar(255)   default ''   COMMENT '事件服务接口请求地址';
 ALTER TABLE mortals_sys_app_info_field ADD COLUMN  `serviceApiParams` varchar(1024) default ''     COMMENT '事件服务接口请求参数';
@@ -214,14 +214,14 @@ ALTER TABLE mortals_sys_app_info_templete_field ADD COLUMN  `serviceApiParams` v
 
 
 -- ----------------------------
-2023-10-17
+-- 2023-10-17
 -- ----------------------------
 
 ALTER TABLE mortals_sys_window_hall ADD COLUMN  `siteId` bigint(20) default '1'     COMMENT '站点Id';
 
 
 -- ----------------------------
-2024-01-03
+-- 2024-01-03
 -- ----------------------------
 ALTER TABLE mortals_sys_site_matter ADD COLUMN   `agent` tinyint(2)    DEFAULT '0'  COMMENT '代办帮办(0.否,1.是)';
 ALTER TABLE mortals_sys_site_matter ADD COLUMN    `agentName` varchar(64)      COMMENT '代办姓名';
@@ -230,7 +230,7 @@ ALTER TABLE mortals_sys_site_matter ADD COLUMN   `agentPost` varchar(64)      CO
 
 
 -- ----------------------------
-2024-02-29
+-- 2024-02-29
 -- ----------------------------
 
 UPDATE mortals_sys_skin_base SET imageResolution="1920x1080" WHERE imageResolution="1";
@@ -239,7 +239,7 @@ UPDATE mortals_sys_skin_base SET imageResolution="1280x1280" WHERE imageResoluti
 
 
 -- ----------------------------
-2024-03-08
+-- 2024-03-08
 -- ----------------------------
 ALTER TABLE mortals_sys_site_matter ADD COLUMN   `hallCheckIn` tinyint(2)    DEFAULT '0'  COMMENT '大厅事项入驻(0.否,1.是)'  AFTER agentPost;
 
@@ -267,3 +267,10 @@ CREATE INDEX idx_matterId ON mortals_sys_matter_intermediary (matterId);
 CREATE INDEX idx_matterId ON mortals_sys_matter_question (matterId);
 CREATE INDEX idx_matterId ON mortals_sys_matter_setbase (matterId);
 CREATE INDEX idx_datumId ON mortals_sys_matter_datum_file (datumId);
+
+
+-- ----------------------------
+-- 2024-12-4 站点风貌添加
+-- ----------------------------
+
+ALTER TABLE mortals_sys_site ADD COLUMN  `govAffairStyle` varchar(1024)      COMMENT '政务风貌，多个逗号分割' AFTER modelIds;

base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteEntity.java

@@ -2,6 +2,9 @@ package com.mortals.xhx.module.site.model;
 import java.util.Date;
 import java.util.List;
 import java.util.ArrayList;
+import java.math.BigDecimal;
+import cn.hutool.core.date.DateUtil;
+import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
@@ -11,7 +14,7 @@ import lombok.Data;
  * 站点实体对象
  *
  * @author zxfei
- * @date 2023-05-07
+ * @date 2024-12-04
  */
 @Data
 public class SiteEntity extends SiteVo {
@@ -161,6 +164,10 @@ public class SiteEntity extends SiteVo {
      * 部署模块，逗号分隔
      */
     private String modelIds;
+    /**
+     * 政务风貌，多个逗号分割
+     */
+    private String govAffairStyle;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -178,74 +185,42 @@ public class SiteEntity extends SiteVo {
     }
 
     public void initAttrValue(){
-
-
         this.siteName = "";
-
         this.siteCode = "";
-
-        this.proCode = "";
-
         this.areaID = "";
-
         this.areaCode = "";
-
+        this.areaName = "";
+        this.proCode = "";
         this.cityCode = "";
-
         this.districtCode = "";
-
-        this.siteIp = "127.0.0.1";
-
-        this.sitePort = "9980";
-
+        this.siteIp = "";
+        this.sitePort = "";
         this.longitude = "";
-
         this.latitude = "";
-
         this.siteTel = "";
-
         this.detailAddress = "";
-
         this.siteRemark = "";
-
         this.amWorkStartTime = null;
-
         this.amWorkEndTime = null;
-
         this.pmWorkStartTime = null;
-
         this.pmWorkEndTime = null;
-
-        this.workday1 = 1;
-
-        this.workday2 = 1;
-
-        this.workday3 = 1;
-
-        this.workday4 = 1;
-
-        this.workday5 = 1;
-
+        this.workday1 = 0;
+        this.workday2 = 0;
+        this.workday3 = 0;
+        this.workday4 = 0;
+        this.workday5 = 0;
         this.workday6 = 0;
-
         this.workday7 = 0;
-
-        this.level = 1;
-
-        this.building = 1;
-
-        this.modelIds = "";
-
-        this.areaName = "";
-
         this.onlineTake = 1;
-
         this.appointment = 1;
-
         this.gowMap = 1;
-
+        this.level = 0;
+        this.building = 0;
         this.logoPath = "";
-
         this.englishName = "";
+        this.leadingOfficial = "";
+        this.leadingOfficialTelephone = "";
+        this.modelIds = "";
+        this.govAffairStyle = "";
     }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteQuery.java

@@ -7,7 +7,7 @@ import com.mortals.xhx.module.site.model.SiteEntity;
  * 站点查询对象
  *
  * @author zxfei
- * @date 2023-05-07
+ * @date 2024-12-04
  */
 public class SiteQuery extends SiteEntity {
     /** 开始 序号，主键，自增长 */
@@ -329,6 +329,11 @@ public class SiteQuery extends SiteEntity {
 
     /** 部署模块，逗号分隔排除列表 */
     private List <String> modelIdsNotList;
+    /** 政务风貌，多个逗号分割 */
+    private List<String> govAffairStyleList;
+
+    /** 政务风貌，多个逗号分割排除列表 */
+    private List <String> govAffairStyleNotList;
     /** 开始 创建时间 */
     private String createTimeStart;
 
@@ -2185,6 +2190,38 @@ public class SiteQuery extends SiteEntity {
         this.modelIdsNotList = modelIdsNotList;
     }
 
+    /**
+     * 获取 政务风貌，多个逗号分割
+     * @return govAffairStyleList
+     */
+    public List<String> getGovAffairStyleList(){
+        return this.govAffairStyleList;
+    }
+
+    /**
+     * 设置 政务风貌，多个逗号分割
+     * @param govAffairStyleList
+     */
+    public void setGovAffairStyleList(List<String> govAffairStyleList){
+        this.govAffairStyleList = govAffairStyleList;
+    }
+
+    /**
+     * 获取 政务风貌，多个逗号分割
+     * @return govAffairStyleNotList
+     */
+    public List<String> getGovAffairStyleNotList(){
+        return this.govAffairStyleNotList;
+    }
+
+    /**
+     * 设置 政务风貌，多个逗号分割
+     * @param govAffairStyleNotList
+     */
+    public void setGovAffairStyleNotList(List<String> govAffairStyleNotList){
+        this.govAffairStyleNotList = govAffairStyleNotList;
+    }
+
     /**
      * 获取 开始 创建时间
      * @return createTimeStart
@@ -3417,6 +3454,25 @@ public class SiteQuery extends SiteEntity {
     }
 
 
+    /**
+     * 设置 政务风貌，多个逗号分割
+     * @param govAffairStyle
+     */
+    public SiteQuery govAffairStyle(String govAffairStyle){
+        setGovAffairStyle(govAffairStyle);
+        return this;
+    }
+
+    /**
+     * 设置 政务风貌，多个逗号分割
+     * @param govAffairStyleList
+     */
+    public SiteQuery govAffairStyleList(List<String> govAffairStyleList){
+        this.govAffairStyleList = govAffairStyleList;
+        return this;
+    }
+
+
     /**
      * 设置  创建用户
      * @param createUserId

portal-manager/src/main/java/com/mortals/xhx/base/system/oper/model/OperLogEntity.java

@@ -9,6 +9,7 @@
 package com.mortals.xhx.base.system.oper.model;
 
 import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.base.system.oper.model.vo.OperLogVo;
 
 import java.util.Date;
 
@@ -20,7 +21,7 @@ import java.util.Date;
  * @author 
  * @version 1.0.0
  */
-public class OperLogEntity extends BaseEntityLong{
+public class OperLogEntity extends OperLogVo {
 	private static final long serialVersionUID = 1547777703333L;
 	
 	/** 平台标识 */

portal-manager/src/main/java/com/mortals/xhx/base/system/oper/model/vo/OperLogVo.java

+package com.mortals.xhx.base.system.oper.model.vo;
+
+import com.mortals.framework.model.BaseEntityLong;
+import lombok.Data;
+
+/**
+* 自助终端应用分类视图对象
+*
+* @author zxfei
+* @date 2023-06-15
+*/
+@Data
+public class OperLogVo extends BaseEntityLong {
+
+
+    /** 开始 操作时间 */
+    private String logDateStart;
+
+    /** 结束 操作时间 */
+    private String logDateEnd;
+}
\ No newline at end of file

portal-manager/src/main/resources/config/mybatis-sqlmap-config.xml

@@ -8,8 +8,6 @@
 		<setting name="useColumnLabel" value="true" />
 		<setting name="useGeneratedKeys" value="false" />
 		<setting name="defaultExecutorType" value="REUSE" />
-		<!-- 是否开始sql日志控制台打印 -->
-<!--		<setting name="logImpl" value="STDOUT_LOGGING" />-->
 	</settings>
 	<plugins>
 		<plugin interceptor="com.mortals.framework.thirty.mybatis.MortalsPagePlugin">
@@ -18,7 +16,7 @@
 		</plugin>
 		<plugin interceptor="com.mortals.framework.thirty.mybatis.LogInterceptor">
 			<property name="enableExecutorTime" value="true" />
-			<property name="showSql" value="true" />
+			<property name="showSql" value="false" />
 		</plugin>
 	</plugins>
 </configuration>
\ No newline at end of file