2024-02-21

src/main/java/com/spring/modules/part/entity/UmInformationEntity.java

@@ -16,10 +16,6 @@ import java.util.List;
 public class UmInformationEntity extends QueryPage implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 工厂
-     **/
-    private String site;
     /**
      * 单位编码
      **/

src/main/java/com/spring/modules/part/service/impl/UmInformationServiceImpl.java

@@ -48,7 +48,7 @@ public class UmInformationServiceImpl extends ServiceImpl<UmInformationMapper, U
     @Override
     public void umInformationSave(UmInformationEntity data) {
         // 校验
-        List<UmInformationEntity> list = query().eq("site", data.getSite()).eq("um_id", data.getUmId()).list();
+        List<UmInformationEntity> list = query().eq("um_id", data.getUmId()).list();
         if (list.size() > 0) {
             throw new RuntimeException("单位编码已存在!");
         }
@@ -66,7 +66,6 @@ public class UmInformationServiceImpl extends ServiceImpl<UmInformationMapper, U
     public void umInformationEdit(UmInformationEntity data) {
         // 编辑单位信息
         UpdateWrapper<UmInformationEntity> updateInformationWrapper = new UpdateWrapper<>();
-        updateInformationWrapper.eq("site", data.getSite());
         updateInformationWrapper.eq("um_id", data.getUmId());
         umInformationMapper.update(data, updateInformationWrapper);
     }
@@ -81,7 +80,6 @@ public class UmInformationServiceImpl extends ServiceImpl<UmInformationMapper, U
     @Override
     public void umInformationDelete(UmInformationEntity data) {
         HashMap<String, Object> map = new HashMap<>();
-        map.put("site", data.getSite());
         map.put("um_id", data.getUmId());
         umInformationMapper.deleteByMap(map);
     }
@@ -95,7 +93,7 @@ public class UmInformationServiceImpl extends ServiceImpl<UmInformationMapper, U
      */
     @Override
     public List<UmInformationEntity> umInformationList(String site) {
-        return lambdaQuery().eq(UmInformationEntity::getSite, site).eq(UmInformationEntity::getActive,"Y").list();
+        return lambdaQuery().eq(UmInformationEntity::getActive,"Y").list();
     }
 
     /**
@@ -107,6 +105,6 @@ public class UmInformationServiceImpl extends ServiceImpl<UmInformationMapper, U
      */
     @Override
     public List<UmInformationEntity> allUmInformationList(String site) {
-        return lambdaQuery().eq(UmInformationEntity::getSite, site).list();
+        return lambdaQuery().list();
     }
 }

src/main/java/com/spring/modules/sift/controller/QueryUserSettingController.java

@@ -0,0 +1,36 @@
+package com.spring.modules.sift.controller;
+
+import com.spring.common.utils.R;
+import com.spring.modules.sift.entity.QueryUserSetting;
+import com.spring.modules.sift.entity.QueryUserSettingDefault;
+import com.spring.modules.sift.service.QueryUserSettingDefaultService;
+import com.spring.modules.sift.service.QueryUserSettingService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/sift")
+@Slf4j
+public class QueryUserSettingController {
+
+    @Autowired
+    private QueryUserSettingDefaultService defaultService;
+
+    @Autowired
+    private QueryUserSettingService queryUserSettingService;
+
+
+    @GetMapping("/list")
+    public R searchUserSettingList(String menuId,String userId){
+        List<QueryUserSetting> queryUserSettingList = queryUserSettingService.searchQueryUserSetting(menuId, userId);
+        if (!queryUserSettingList.isEmpty()){
+            return R.ok().put("rows",queryUserSettingList);
+        }
+        return R.ok().put("rows",defaultService.searchQueryUserSettingDefault(menuId));
+    }
+}

src/main/java/com/spring/modules/sift/entity/QueryUserSetting.java

@@ -0,0 +1,75 @@
+package com.spring.modules.sift.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+
+/**
+ * 默认筛选条件(QueryUserSetting)表实体类
+ *
+ * @author makejava
+ * @since 2024-02-21 10:12:37
+ */
+@TableName("query_user_setting")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class QueryUserSetting implements Serializable {
+    /**
+     * 菜单编码
+     */
+    private String menuId;
+    /**
+     * 菜单编码
+     */
+    private String userId;
+
+    private String dtsName;
+    /**
+     * DTS标题
+     */
+    private String dtsCaption;
+    /**
+     * 字段名称
+     */
+    private String fieldName;
+    /**
+     * 字段标题
+     */
+    private String fieldCaption;
+    /**
+     * 数据源字段
+     */
+    private String originalField;
+    /**
+     * 数据类型
+     */
+    private String dataType;
+
+    private String funs;
+    /**
+     * 是否显示
+     */
+    private String visible;
+    /**
+     * 排序规则
+     */
+    private Integer showSeqNo;
+
+    private Integer lovSeqId;
+
+    private Integer iTagId;
+
+    private String symbol;
+
+    private String formula;
+
+    private String sortBy;
+
+    private String orderSeq;
+
+}
+

src/main/java/com/spring/modules/sift/entity/QueryUserSettingDefault.java

@@ -0,0 +1,77 @@
+package com.spring.modules.sift.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+
+/**
+ * 默认筛选条件(QueryUserSettingDefault)表实体类
+ *
+ * @since 2024-02-21 10:11:50
+ */
+@TableName("query_user_setting_default")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class QueryUserSettingDefault implements Serializable {
+    /**
+     * 菜单编码
+     */
+    private String menuId;
+
+    private String dtsName;
+    /**
+     * DTS标题
+     */
+    private String dtsCaption;
+    /**
+     * 字段名称
+     */
+    private String fieldName;
+    /**
+     * 字段标题
+     */
+    private String fieldCaption;
+    /**
+     * 数据源字段
+     */
+    private String originalField;
+    /**
+     * 数据类型
+     */
+    private String dataType;
+
+    private String funs;
+    /**
+     * 是否显示
+     */
+    private String visible;
+    /**
+     * 排序规则
+     */
+    private Integer showSeqNo;
+
+    private Integer lovSeqId;
+
+    private Integer iTagId;
+
+    /**
+     * 条件
+     */
+    private String symbol;
+    /**
+     * 值
+     */
+    private String formula;
+    /**
+     * 排序规则
+     */
+    private String sortBy;
+
+    private String orderSeq;
+
+}
+

src/main/java/com/spring/modules/sift/mapper/QueryUserSettingDefaultMapper.java

@@ -0,0 +1,10 @@
+package com.spring.modules.sift.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.spring.modules.sift.entity.QueryUserSettingDefault;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface QueryUserSettingDefaultMapper extends BaseMapper<QueryUserSettingDefault> {
+
+}

src/main/java/com/spring/modules/sift/mapper/QueryUserSettingMapper.java

@@ -0,0 +1,9 @@
+package com.spring.modules.sift.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.spring.modules.sift.entity.QueryUserSetting;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface QueryUserSettingMapper extends BaseMapper<QueryUserSetting> {
+}

src/main/java/com/spring/modules/sift/service/QueryUserSettingDefaultService.java

@@ -0,0 +1,11 @@
+package com.spring.modules.sift.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.spring.modules.sift.entity.QueryUserSettingDefault;
+
+import java.util.List;
+
+public interface QueryUserSettingDefaultService extends IService<QueryUserSettingDefault> {
+
+    List<QueryUserSettingDefault> searchQueryUserSettingDefault(String menuId);
+}

src/main/java/com/spring/modules/sift/service/QueryUserSettingService.java

@@ -0,0 +1,12 @@
+package com.spring.modules.sift.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.spring.modules.sift.entity.QueryUserSetting;
+import com.spring.modules.sift.entity.QueryUserSettingDefault;
+
+import java.util.List;
+
+public interface QueryUserSettingService extends IService<QueryUserSetting> {
+
+    List<QueryUserSetting> searchQueryUserSetting(String menuId,String userId);
+}

src/main/java/com/spring/modules/sift/service/impl/QueryUserSettingDefaultServiceImpl.java

@@ -0,0 +1,23 @@
+package com.spring.modules.sift.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.spring.modules.sift.entity.QueryUserSettingDefault;
+import com.spring.modules.sift.mapper.QueryUserSettingDefaultMapper;
+import com.spring.modules.sift.service.QueryUserSettingDefaultService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+
+@Service
+@Slf4j
+public class QueryUserSettingDefaultServiceImpl extends ServiceImpl<QueryUserSettingDefaultMapper, QueryUserSettingDefault> implements QueryUserSettingDefaultService {
+    @Override
+    public List<QueryUserSettingDefault> searchQueryUserSettingDefault(String menuId) {
+        if (!StringUtils.hasText(menuId)){
+            throw new RuntimeException("菜单编码不能为空");
+        }
+        return lambdaQuery().eq(QueryUserSettingDefault::getMenuId,menuId).list();
+    }
+}

src/main/java/com/spring/modules/sift/service/impl/QueryUserSettingServiceImpl.java

@@ -0,0 +1,26 @@
+package com.spring.modules.sift.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.spring.modules.sift.entity.QueryUserSetting;
+import com.spring.modules.sift.mapper.QueryUserSettingMapper;
+import com.spring.modules.sift.service.QueryUserSettingService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+
+@Service
+@Slf4j
+public class QueryUserSettingServiceImpl extends ServiceImpl<QueryUserSettingMapper, QueryUserSetting> implements QueryUserSettingService {
+    @Override
+    public List<QueryUserSetting> searchQueryUserSetting(String menuId, String userId) {
+        if (!StringUtils.hasText(menuId)){
+            throw new RuntimeException("菜单编码不能为空");
+        }
+        if (!StringUtils.hasText(userId)){
+            throw new RuntimeException("用户编码不能为空");
+        }
+        return lambdaQuery().eq(QueryUserSetting::getMenuId,menuId).eq(QueryUserSetting::getUserId,userId).list();
+    }
+}

src/main/resources/mapper/part/UmInformationMapper.xml

@@ -5,7 +5,6 @@
     <!-- 单位信息列表 -->
     <select id="umInformationSearch" parameterType="com.spring.modules.part.vo.UmInformationVo" resultType="com.spring.modules.part.vo.UmInformationVo">
         SELECT
-            site,
             um_id,
             um_name,
             active,
@@ -15,7 +14,6 @@
             update_date
         FROM um
         <where>
-            site = #{query.site}
             <if test = "query.umId != null and query.umId != ''">
                 AND um_id like #{query.umId}
             </if>