Merge remote-tracking branch 'origin/main' into main

ruoyi-admin/src/main/java/com/ruoyi/web/controller/dragForm/CommonController.java

@@ -13,6 +13,7 @@ import com.ruoyi.system.service.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @RestController
@@ -109,4 +110,14 @@ public class CommonController extends BaseController {
         return getDataTable(commonService.dragTablePreview(commonEntity));
     }
 
+    /**
+     * 通用批量查询下拉框数据接口
+     */
+    @PostMapping("/queryDropDownBoxData")
+    public AjaxResult queryDropDownBoxData(@RequestBody List<CommonEntity> commonEntityList){
+        return AjaxResult.success(commonService.queryDropDownBoxData(commonEntityList));
+    }
+
+
+
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -15,7 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 
  * @author ruoyi
  */
-public class SysDept extends BaseEntity
+public class SysDept
 {
     private static final long serialVersionUID = 1L;
 
@@ -194,10 +194,6 @@ public class SysDept extends BaseEntity
             .append("email", getEmail())
             .append("status", getStatus())
             .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
             .toString();
     }
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java

@@ -15,7 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 
  * @author ruoyi
  */
-public class SysRole extends BaseEntity
+public class SysRole
 {
     private static final long serialVersionUID = 1L;
 
@@ -231,11 +231,6 @@ public class SysRole extends BaseEntity
             .append("deptCheckStrictly", isDeptCheckStrictly())
             .append("status", getStatus())
             .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
             .toString();
     }
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysTenant.java

@@ -13,7 +13,7 @@ import javax.validation.constraints.Size;
  * 
  * @author ruoyi
  */
-public class SysTenant extends BaseEntity
+public class SysTenant
 {
     private static final long serialVersionUID = 1L;
 
@@ -134,10 +134,6 @@ public class SysTenant extends BaseEntity
             .append("contactInfo", getContactInfo())
             .append("address", getAddress())
             .append("isDel", getIsDel())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
             .append("datasourceId",getTenantId())
             .append("dataSource",getDataSource())
             .toString();

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -17,7 +17,7 @@ import com.ruoyi.common.xss.Xss;
  *
  * @author ruoyi
  */
-public class SysUser extends BaseEntity
+public class SysUser
 {
     private static final long serialVersionUID = 1L;
 
@@ -359,11 +359,6 @@ public class SysUser extends BaseEntity
                 .append("delFlag", getDelFlag())
                 .append("loginIp", getLoginIp())
                 .append("loginDate", getLoginDate())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("remark", getRemark())
                 .append("dept", getDept())
                 .append("tenant", getTenant())
                 .append("tenantName",getTenantName())

ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java

@@ -76,6 +76,7 @@ public class SecurityUtils {
         try {
             return (LoginUser) getAuthentication().getPrincipal();
         } catch (Exception e) {
+            System.err.println(e);
             throw new ServiceException("获取用户信息异常", HttpStatus.UNAUTHORIZED);
         }
     }

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java

@@ -61,7 +61,7 @@ public class TokenService {
         if (StringUtils.isNotEmpty(token)) {
             try {
                 String uuid = "";
-                if (token.contains("XIAFA")) {  // 判断当前请求是否别的项目下发的 茹村
+                if (token.contains("XIAFA")) {  // 判断当前请求是否别的项目下发的
                     uuid = token.replace("XIAFA", "");
                 } else {
                     Claims claims = parseToken(token);
@@ -69,7 +69,7 @@ public class TokenService {
                     uuid = (String) claims.get(Constants.LOGIN_USER_KEY);
                 }
                 String userKey = getTokenKey(uuid);
-                LoginUser user = redisCache.getCacheObject(userKey);
+                LoginUser user  = redisCache.getCacheObject(userKey);
                 return user;
             } catch (Exception e) {
             }

ruoyi-system/src/main/java/com/ruoyi/system/entity/CommonEntity.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
@@ -18,7 +19,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
  * @author hanzihang
  * @date 2023/7/19 4:05 PM
  */
-public class CommonEntity extends BaseEntity {
+public class CommonEntity extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

ruoyi-system/src/main/java/com/ruoyi/system/entity/DataSource.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 import java.io.Serializable;
 
-public class DataSource extends BaseEntity {
+public class DataSource extends BaseEntity  implements Serializable{
 
     private static final long serialVersionUID = 1L;
 

ruoyi-system/src/main/java/com/ruoyi/system/entity/DragForm.java

@@ -5,6 +5,8 @@ import com.ruoyi.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.io.Serializable;
+
 /**
  * 动态表单
  * 对象 drag_form
@@ -12,7 +14,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author ruoyi
  * @date 2023-07-12
  */
-public class DragForm extends BaseEntity {
+public class DragForm extends BaseEntity  implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/entity/DragTable.java

@@ -1,17 +1,17 @@
 package com.ruoyi.system.entity;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.io.Serializable;
+
 /**
  * 动态表格对象 drag_table
  *
  * @author ruoyi
  * @date 2023-07-31
  */
-public class DragTable extends BaseEntity {
+public class DragTable extends BaseEntity  implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/entity/DragTableBtnRelevance.java

@@ -5,13 +5,15 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.io.Serializable;
+
 /**
  * 动态格和动态格按钮关联对象 drag_table_btn_relevance
  *
  * @author ruoyi
  * @date 2023-11-09
  */
-public class DragTableBtnRelevance extends BaseEntity {
+public class DragTableBtnRelevance extends BaseEntity  implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/entity/DragTableCondition.java

@@ -5,6 +5,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
@@ -14,7 +15,7 @@ import java.util.Map;
  * @author ruoyi
  * @date 2023-07-31
  */
-public class DragTableCondition extends BaseEntity {
+public class DragTableCondition extends BaseEntity  implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/entity/DragTableGroup.java

@@ -5,12 +5,14 @@ import com.ruoyi.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.io.Serializable;
+
 /**
  * @author hmc
  * @date 2023-11-01 14:19
  * @Description: 拖拽格组对象 drag_table_group
  */
-public class DragTableGroup extends BaseEntity {
+public class DragTableGroup extends BaseEntity  implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

ruoyi-system/src/main/java/com/ruoyi/system/entity/TableSql.java

@@ -1,17 +1,17 @@
 package com.ruoyi.system.entity;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.io.Serializable;
+
 /**
  * table 联合查询sql存储对象 table_sql
  *
  * @author ruoyi
  * @date 2023-07-19
  */
-public class TableSql extends BaseEntity {
+public class TableSql extends BaseEntity  implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/entity/vo/DragTableGroupVo.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.entity.vo;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -9,7 +10,7 @@ import java.util.List;
  * @date 2023-11-03 15:55
  * @Description:
  */
-public class DragTableGroupVo extends BaseEntity {
+public class DragTableGroupVo extends BaseEntity  implements Serializable {
 
     /** 主键 */
     private Long id;

ruoyi-system/src/main/java/com/ruoyi/system/mapper/CommonMapper.java

@@ -58,4 +58,12 @@ public interface CommonMapper {
      */
     List<Map<String,Object>> executeSql(String sql);
 
+    /**
+     * 查询数据
+     * @param tableName 表名
+     * @param conditions key表字段 value字段值集合
+     * @return
+     */
+    List<Map<String,Object>> queryDropDownBoxData(@Param("tableName") String tableName, @Param("conditions") Map<String, Object> conditions);
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ICommonService.java

@@ -6,6 +6,7 @@ import com.ruoyi.system.entity.TableSql;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 
 
 public interface ICommonService {
@@ -64,6 +65,11 @@ public interface ICommonService {
      */
     CommonEntity getInfoById(CommonEntity commonEntity);
 
+    /**
+     * 通用批量查询下拉框数据接口
+     */
+    CommonEntity queryDropDownBoxData(List<CommonEntity> commonEntityList);
+
 
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CommonServiceImpl.java

@@ -299,6 +299,25 @@ public class CommonServiceImpl implements ICommonService {
         return common;
     }
 
+    @Override
+    public CommonEntity queryDropDownBoxData(List<CommonEntity> commonEntityList) {
+        Map<String,Object> retMap = new HashMap<>();
+        for (CommonEntity commonEntity : commonEntityList){
+            String tableName = (String) commonEntity.getBasicMap().get("tableName");
+            Map<String, Object> conditions = JSONObject.parseObject(JSON.toJSONString(commonEntity.getConditionMap()));
+            List<Long> list = new ArrayList<>();
+            list.add(0L);
+            conditions.put("del_flag",list);
+            List<Map<String,Object>> mapList = commonMapper.queryDropDownBoxData(tableName,conditions);
+            retMap.put(tableName,mapList);
+        }
+        CommonEntity commonEntity = new CommonEntity();
+        commonEntity.setResultMap(retMap);
+        return commonEntity;
+    }
+
+
+
     public static String extractSubstring(String input, String identifier) {
         int startIndex = input.indexOf(identifier);
         if (startIndex == -1) {

ruoyi-system/src/main/resources/mapper/common/CommonMapper.xml

@@ -96,4 +96,18 @@
         ${sql}
     </select>
 
+    <select id="queryDropDownBoxData" resultType="map">
+        select * from {DBNAME}.${tableName}
+        <where>
+            <if test="conditions != null">
+                <foreach collection="conditions" item="value" index="key" separator="and">
+                    ${key} in
+                    <foreach collection="value" item="v" open="(" close=")" separator=",">
+                        #{v}
+                    </foreach>
+                </foreach>
+            </if>
+        </where>
+    </select>
+
 </mapper>