Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/SysPushController.java → dsk-admin/src/main/java/com/dsk/web/controller/system/SysPushController.java

-package com.dsk.cscec.controller;
+package com.dsk.web.controller.system;
 
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -6,14 +6,11 @@ import com.dsk.common.core.controller.BaseController;
 import com.dsk.common.core.domain.PageQuery;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
-import com.dsk.cscec.domain.SysPush;
-import com.dsk.cscec.service.ISysPushService;
-import org.apache.ibatis.annotations.Delete;
+import com.dsk.system.domain.SysPush;
+import com.dsk.system.service.ISysPushService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-
 /**
  * 系统推送(SysPush)表控制层
  *

dsk-common/src/main/java/com/dsk/common/constant/Constants.java

@@ -82,5 +82,7 @@ public interface Constants {
 
     String CONTENT_TYPE_XLSX = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
 
+    String STATUTORY_HOLIDAY_ADDR = "https://timor.tech/api/holiday/year/";
+
 }
 

dsk-operate-ui/src/api/common.js

@@ -38,6 +38,6 @@ export function dskAccessToken() {
  * @returns {Array<object>}
  */
 export const getAreaListApi = () => request({
-  url: "/area/all",
+  url: "/area/all/withoutRegion",
   method: "get"
 });

dsk-operate-ui/src/utils/index.js

@@ -601,7 +601,7 @@ export function queryConditionFiltering(params) {
     for (let index = 0; index < len; index++) {
       const key = keys[index];
       if (_temp.hasOwnProperty(key)) {
-        // 数组内部不处理 外部处理
+        // 数组内部不处理
         if (_temp[key] instanceof Array && _temp[key]?.length) {
           result[key] = _temp[key];
           continue;
@@ -612,7 +612,7 @@ export function queryConditionFiltering(params) {
           continue;
         }
         // 过滤无效值 0为有效数据
-        if (_temp[key] || _temp[key] == "0") {
+        if (typeof _temp[key] != "object" && (_temp[key] || _temp[key] == "0")) {
           result[key] = _temp[key];
           continue;
         }

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/SysPush.java → dsk-system/src/main/java/com/dsk/system/domain/SysPush.java

-package com.dsk.cscec.domain;
+package com.dsk.system.domain;
 
 import java.util.Date;
 import java.io.Serializable;
@@ -42,6 +42,6 @@ public class SysPush implements Serializable {
 
     private Date createTime;
 
-    private String tanentId;
+    private String tenantId;
 }
 

dsk-system/src/main/java/com/dsk/system/domain/SysStatutoryHoliday.java

+package com.dsk.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * @Author lcl
+ * @Data 2023/12/14 15:23
+ */
+@Data
+@TableName("sys_statutory_holiday")
+public class SysStatutoryHoliday {
+
+    @TableId("id")
+    private Long id;
+    /**
+     * 是否假日 0：否 1：是
+     */
+    private Integer isHoliday;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 日期
+     */
+    private String date;
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/SysPushMapper.java → dsk-system/src/main/java/com/dsk/system/mapper/SysPushMapper.java

-package com.dsk.cscec.mapper;
+package com.dsk.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dsk.cscec.domain.SysPush;
+import com.dsk.system.domain.SysPush;
 
 /**
  * 系统推送(SysPush)表数据库访问层

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/ISysPushService.java → dsk-system/src/main/java/com/dsk/system/service/ISysPushService.java

-package com.dsk.cscec.service;
+package com.dsk.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsk.common.core.domain.PageQuery;
 import com.dsk.common.core.page.TableDataInfo;
-import com.dsk.cscec.domain.SysPush;
+import com.dsk.system.domain.SysPush;
 
 /**
  * 系统推送(SysPush)表服务接口

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/SysPushServiceImpl.java → dsk-system/src/main/java/com/dsk/system/service/impl/SysPushServiceImpl.java

-package com.dsk.cscec.service.impl;
+package com.dsk.system.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsk.common.core.domain.PageQuery;
 import com.dsk.common.core.page.TableDataInfo;
-import com.dsk.common.exception.ServiceException;
-import com.dsk.cscec.mapper.SysPushMapper;
-import com.dsk.cscec.domain.SysPush;
-import com.dsk.cscec.service.ISysPushService;
+import com.dsk.system.mapper.SysPushMapper;
+import com.dsk.system.domain.SysPush;
+import com.dsk.system.service.ISysPushService;
 import jodd.bean.BeanException;
 import org.springframework.stereotype.Service;