Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_java_monomer

# Conflicts:
#	nursing-unit-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java

nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -112,7 +112,7 @@ public class ShiroConfig {
 
         //update-begin--Author:scott Date:20221116 for：排除静态资源后缀
         filterChainDefinitionMap.put("/", "anon");
-        filterChainDefinitionMap.put("/doc.html", "anon");
+//        filterChainDefinitionMap.put("/doc.html", "anon");
         filterChainDefinitionMap.put("/**/*.js", "anon");
         filterChainDefinitionMap.put("/**/*.css", "anon");
         filterChainDefinitionMap.put("/**/*.html", "anon");
@@ -129,35 +129,35 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/**/*.wasm", "anon");
         //update-end--Author:scott Date:20221116 for：排除静态资源后缀
 
-        filterChainDefinitionMap.put("/druid/**", "anon");
+//        filterChainDefinitionMap.put("/druid/**", "anon");
-        filterChainDefinitionMap.put("/swagger-ui.html", "anon");
+//        filterChainDefinitionMap.put("/swagger-ui.html", "anon");
-        filterChainDefinitionMap.put("/swagger**/**", "anon");
+//        filterChainDefinitionMap.put("/swagger**/**", "anon");
-        filterChainDefinitionMap.put("/webjars/**", "anon");
+//        filterChainDefinitionMap.put("/webjars/**", "anon");
-        filterChainDefinitionMap.put("/v2/**", "anon");
+//        filterChainDefinitionMap.put("/v2/**", "anon");
 
         // update-begin--Author:sunjianlei Date:20210510 for：排除消息通告查看详情页面（用于第三方APP）
-        filterChainDefinitionMap.put("/sys/annountCement/show/**", "anon");
+//        filterChainDefinitionMap.put("/sys/annountCement/show/**", "anon");
         // update-end--Author:sunjianlei Date:20210510 for：排除消息通告查看详情页面（用于第三方APP）
 
         //积木报表排除
-        filterChainDefinitionMap.put("/jmreport/**", "anon");
+//        filterChainDefinitionMap.put("/jmreport/**", "anon");
-        filterChainDefinitionMap.put("/**/*.js.map", "anon");
+//        filterChainDefinitionMap.put("/**/*.js.map", "anon");
-        filterChainDefinitionMap.put("/**/*.css.map", "anon");
+//        filterChainDefinitionMap.put("/**/*.css.map", "anon");
 
         //积木BI大屏和仪表盘排除
-        filterChainDefinitionMap.put("/drag/view", "anon");
+//        filterChainDefinitionMap.put("/drag/view", "anon");
-        filterChainDefinitionMap.put("/drag/page/queryById", "anon");
+//        filterChainDefinitionMap.put("/drag/page/queryById", "anon");
-        filterChainDefinitionMap.put("/drag/page/addVisitsNumber", "anon");
+//        filterChainDefinitionMap.put("/drag/page/addVisitsNumber", "anon");
-        filterChainDefinitionMap.put("/drag/page/queryTemplateList", "anon");
+//        filterChainDefinitionMap.put("/drag/page/queryTemplateList", "anon");
-        filterChainDefinitionMap.put("/drag/share/view/**", "anon");
+//        filterChainDefinitionMap.put("/drag/share/view/**", "anon");
-        filterChainDefinitionMap.put("/drag/onlDragDatasetHead/getAllChartData", "anon");
+//        filterChainDefinitionMap.put("/drag/onlDragDatasetHead/getAllChartData", "anon");
-        filterChainDefinitionMap.put("/drag/onlDragDatasetHead/getTotalData", "anon");
+//        filterChainDefinitionMap.put("/drag/onlDragDatasetHead/getTotalData", "anon");
-        filterChainDefinitionMap.put("/drag/mock/json/**", "anon");
+//        filterChainDefinitionMap.put("/drag/mock/json/**", "anon");
 
         //大屏模板例子
-        filterChainDefinitionMap.put("/test/bigScreen/**", "anon");
+//        filterChainDefinitionMap.put("/test/bigScreen/**", "anon");
-        filterChainDefinitionMap.put("/bigscreen/template1/**", "anon");
+//        filterChainDefinitionMap.put("/bigscreen/template1/**", "anon");
-        filterChainDefinitionMap.put("/bigscreen/template2/**", "anon");
+//        filterChainDefinitionMap.put("/bigscreen/template2/**", "anon");
         //filterChainDefinitionMap.put("/test/jeecgDemo/rabbitMqClientTest/**", "anon"); //MQ测试
         //filterChainDefinitionMap.put("/test/jeecgDemo/html", "anon"); //模板页面
         //filterChainDefinitionMap.put("/test/jeecgDemo/redis/**", "anon"); //redis测试

nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/configSuppliersInfo/controller/ConfigSuppliersInfoController.java

@@ -0,0 +1,184 @@
+package com.nu.modules.configSuppliersInfo.controller;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.query.QueryRuleEnum;
+import org.jeecg.common.util.oConvertUtils;
+import com.nu.modules.configSuppliersInfo.entity.ConfigSuppliersInfo;
+import com.nu.modules.configSuppliersInfo.service.IConfigSuppliersInfoService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: 供应商
+ * @Author: jeecg-boot
+ * @Date:   2025-03-12
+ * @Version: V1.0
+ */
+@Api(tags="供应商")
+@RestController
+@RequestMapping("/configSuppliersInfo/configSuppliersInfo")
+@Slf4j
+public class ConfigSuppliersInfoController extends JeecgController<ConfigSuppliersInfo, IConfigSuppliersInfoService> {
+	@Autowired
+	private IConfigSuppliersInfoService configSuppliersInfoService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param configSuppliersInfo
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "供应商-分页列表查询")
+	@ApiOperation(value="供应商-分页列表查询", notes="供应商-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<ConfigSuppliersInfo>> queryPageList(ConfigSuppliersInfo configSuppliersInfo,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+        // 自定义查询规则
+        Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
+        // 自定义多选的查询规则为：LIKE_WITH_OR
+        customeRuleMap.put("supplyState", QueryRuleEnum.LIKE_WITH_OR);
+        QueryWrapper<ConfigSuppliersInfo> queryWrapper = QueryGenerator.initQueryWrapper(configSuppliersInfo, req.getParameterMap(),customeRuleMap);
+		Page<ConfigSuppliersInfo> page = new Page<ConfigSuppliersInfo>(pageNo, pageSize);
+		IPage<ConfigSuppliersInfo> pageList = configSuppliersInfoService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param configSuppliersInfo
+	 * @return
+	 */
+	@AutoLog(value = "供应商-添加")
+	@ApiOperation(value="供应商-添加", notes="供应商-添加")
+	@RequiresPermissions("configSuppliersInfo:config_suppliers_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody ConfigSuppliersInfo configSuppliersInfo) {
+		configSuppliersInfoService.save(configSuppliersInfo);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param configSuppliersInfo
+	 * @return
+	 */
+	@AutoLog(value = "供应商-编辑")
+	@ApiOperation(value="供应商-编辑", notes="供应商-编辑")
+	@RequiresPermissions("configSuppliersInfo:config_suppliers_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody ConfigSuppliersInfo configSuppliersInfo) {
+		configSuppliersInfoService.updateById(configSuppliersInfo);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "供应商-通过id删除")
+	@ApiOperation(value="供应商-通过id删除", notes="供应商-通过id删除")
+	@RequiresPermissions("configSuppliersInfo:config_suppliers_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		configSuppliersInfoService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "供应商-批量删除")
+	@ApiOperation(value="供应商-批量删除", notes="供应商-批量删除")
+	@RequiresPermissions("configSuppliersInfo:config_suppliers_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.configSuppliersInfoService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "供应商-通过id查询")
+	@ApiOperation(value="供应商-通过id查询", notes="供应商-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<ConfigSuppliersInfo> queryById(@RequestParam(name="id",required=true) String id) {
+		ConfigSuppliersInfo configSuppliersInfo = configSuppliersInfoService.getById(id);
+		if(configSuppliersInfo==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(configSuppliersInfo);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param configSuppliersInfo
+    */
+    @RequiresPermissions("configSuppliersInfo:config_suppliers_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ConfigSuppliersInfo configSuppliersInfo) {
+        return super.exportXls(request, configSuppliersInfo, ConfigSuppliersInfo.class, "供应商");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequiresPermissions("configSuppliersInfo:config_suppliers_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ConfigSuppliersInfo.class);
+    }
+
+}

nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/configSuppliersInfo/entity/ConfigSuppliersInfo.java

@@ -0,0 +1,107 @@
+package com.nu.modules.configSuppliersInfo.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import org.jeecg.common.constant.ProvinceCityArea;
+import org.jeecg.common.util.SpringContextUtils;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 供应商
+ * @Author: jeecg-boot
+ * @Date:   2025-03-12
+ * @Version: V1.0
+ */
+@Data
+@TableName("config_suppliers_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="config_suppliers_info对象", description="供应商")
+public class ConfigSuppliersInfo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private java.lang.String id;
+	/**供应商名称*/
+	@Excel(name = "供应商名称", width = 15)
+    @ApiModelProperty(value = "供应商名称")
+    private java.lang.String suppliersName;
+	/**供应商性质*/
+	@Excel(name = "供应商性质", width = 15, dicCode = "suppliers_nature")
+	@Dict(dicCode = "suppliers_nature")
+    @ApiModelProperty(value = "供应商性质")
+    private java.lang.String suppliersNature;
+	/**供应商地址*/
+	@Excel(name = "供应商地址", width = 15)
+    @ApiModelProperty(value = "供应商地址")
+    private java.lang.String suppliersAddress;
+	/**负责人*/
+	@Excel(name = "负责人", width = 15)
+    @ApiModelProperty(value = "负责人")
+    private java.lang.String personInCharge;
+	/**联系电话*/
+	@Excel(name = "联系电话", width = 15)
+    @ApiModelProperty(value = "联系电话")
+    private java.lang.String contactNumber;
+	/**供应状态*/
+	@Excel(name = "供应状态", width = 15, dicCode = "supply_state")
+	@Dict(dicCode = "supply_state")
+    @ApiModelProperty(value = "供应状态")
+    private java.lang.String supplyState;
+	/**开户行*/
+	@Excel(name = "开户行", width = 15)
+    @ApiModelProperty(value = "开户行")
+    private java.lang.String openingBank;
+	/**开户行账号*/
+	@Excel(name = "开户行账号", width = 15)
+    @ApiModelProperty(value = "开户行账号")
+    private java.lang.String openingBankNo;
+	/**微信账号*/
+	@Excel(name = "微信账号", width = 15)
+    @ApiModelProperty(value = "微信账号")
+    private java.lang.String wechartId;
+	/**资质照片*/
+	@Excel(name = "资质照片", width = 15)
+    @ApiModelProperty(value = "资质照片")
+    private java.lang.String imgPath;
+	/**是否删除 0未删除 1删除*/
+	@Excel(name = "是否删除 0未删除 1删除", width = 15)
+    @ApiModelProperty(value = "是否删除 0未删除 1删除")
+    @TableLogic
+    private java.lang.String delFlag;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+}

nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/configSuppliersInfo/mapper/ConfigSuppliersInfoMapper.java

@@ -0,0 +1,17 @@
+package com.nu.modules.configSuppliersInfo.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.nu.modules.configSuppliersInfo.entity.ConfigSuppliersInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 供应商
+ * @Author: jeecg-boot
+ * @Date:   2025-03-12
+ * @Version: V1.0
+ */
+public interface ConfigSuppliersInfoMapper extends BaseMapper<ConfigSuppliersInfo> {
+
+}

nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/configSuppliersInfo/mapper/xml/ConfigSuppliersInfoMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.nu.modules.configSuppliersInfo.mapper.ConfigSuppliersInfoMapper">
+
+</mapper>

nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/configSuppliersInfo/service/IConfigSuppliersInfoService.java

@@ -0,0 +1,14 @@
+package com.nu.modules.configSuppliersInfo.service;
+
+import com.nu.modules.configSuppliersInfo.entity.ConfigSuppliersInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 供应商
+ * @Author: jeecg-boot
+ * @Date:   2025-03-12
+ * @Version: V1.0
+ */
+public interface IConfigSuppliersInfoService extends IService<ConfigSuppliersInfo> {
+
+}

nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/configSuppliersInfo/service/impl/ConfigSuppliersInfoServiceImpl.java

@@ -0,0 +1,19 @@
+package com.nu.modules.configSuppliersInfo.service.impl;
+
+import com.nu.modules.configSuppliersInfo.entity.ConfigSuppliersInfo;
+import com.nu.modules.configSuppliersInfo.mapper.ConfigSuppliersInfoMapper;
+import com.nu.modules.configSuppliersInfo.service.IConfigSuppliersInfoService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 供应商
+ * @Author: jeecg-boot
+ * @Date:   2025-03-12
+ * @Version: V1.0
+ */
+@Service
+public class ConfigSuppliersInfoServiceImpl extends ServiceImpl<ConfigSuppliersInfoMapper, ConfigSuppliersInfo> implements IConfigSuppliersInfoService {
+
+}