Merge remote-tracking branch 'origin/V0.0.1' into V0.0.1

soc-modules/soc-modules-system/src/main/java/com/xunmei/util/BeanHelper.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/util/BeanHelper.java

@@ -1,4 +1,4 @@
-package com.xunmei.util;
+package com.xunmei.common.core.util;
 
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;

soc-modules/soc-modules-system/src/main/java/com/xunmei/util/DateHelper.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/util/DateHelper.java

@@ -1,10 +1,10 @@
-package com.xunmei.util;
+package com.xunmei.common.core.util;
 
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
-import io.netty.util.internal.StringUtil;
+import com.xunmei.common.core.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.time.DateUtils;
 
@@ -247,21 +247,21 @@ public class DateHelper {
 
     public static String toStr(Date date) {
         if (date == null) {
-            return StringUtil.EMPTY_STRING;
+            return "";
         }
         return dateFormat.format(date);
     }
 
     public static String toStrWithoutHms(Date date) {
         if (date == null) {
-            return StringUtil.EMPTY_STRING;
+            return "";
         }
         return dayFormat.format(date);
     }
 
     public static String toStrWithoutYmd(Date date) {
         if (date == null) {
-            return StringUtil.EMPTY_STRING;
+            return "";
         }
         return HmsFormat.format(date);
     }
@@ -636,7 +636,7 @@ public class DateHelper {
         if (number == 7) {
             return "天";
         }
-        return StringUtil.EMPTY_STRING;
+        return "";
     }
 
     public static int getMonth(DateTime date) {

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/util/Generator.java

@@ -0,0 +1,147 @@
+//package com.xunmei.common.core.util;
+//
+//import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
+//import com.baomidou.mybatisplus.core.toolkit.StringPool;
+//import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+//import com.baomidou.mybatisplus.generator.AutoGenerator;
+//import com.baomidou.mybatisplus.generator.InjectionConfig;
+//import com.baomidou.mybatisplus.generator.config.*;
+//import com.baomidou.mybatisplus.generator.config.converts.MySqlTypeConvert;
+//import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+//import com.baomidou.mybatisplus.generator.config.rules.DbColumnType;
+//import com.baomidou.mybatisplus.generator.config.rules.IColumnType;
+//import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+//import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//import java.util.Scanner;
+//
+///**
+// * @author luojun
+// * @date 2022/8/11 16:41
+// */
+//public class Generator {
+//    /**
+//     * <p>
+//     * 读取控制台内容
+//     * </p>
+//     */
+//    public static String scanner(String tip) {
+//        Scanner scanner = new Scanner(System.in);
+//        StringBuilder help = new StringBuilder();
+//        help.append("请输入" + tip + "：");
+//        System.out.println(help.toString());
+//        if (scanner.hasNext()) {
+//            String ipt = scanner.next();
+//            if (StringUtils.isNotEmpty(ipt)) {
+//                return ipt;
+//            }
+//        }
+//        throw new MybatisPlusException("请输入正确的" + tip + "！");
+//    }
+//
+//    public static void main(String[] args) {
+//        // 代码生成器
+//        AutoGenerator mpg = new AutoGenerator();
+//
+//        // 全局配置
+//        GlobalConfig gc = new GlobalConfig();
+//        String projectPath = System.getProperty("user.dir")+"\\soc-modules\\soc-modules-system" ;
+//        gc.setOutputDir(projectPath + "/src/main/java");
+//        gc.setAuthor("luojun");
+//        gc.setOpen(false);
+//        //是否覆盖文件
+//        gc.setFileOverride(false);
+//        // xml resultmap
+//        gc.setBaseResultMap(true);
+//        // xml columlist
+//        gc.setBaseColumnList(true);
+//        //实体属性 Swagger2 注解
+//        gc.setSwagger2(true);
+//        mpg.setGlobalConfig(gc);
+//
+//        // 数据源配置
+//        DataSourceConfig dsc = new DataSourceConfig();
+////        dsc.setUrl("jdbc:mysql://10.87.10.54:3306/soc");
+////        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
+////        dsc.setUsername("root");
+////        dsc.setPassword("XM_zm2019");
+//        dsc.setUrl("jdbc:mysql://10.87.11.94:3306/soc");
+//        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
+//        dsc.setUsername("root");
+//        dsc.setPassword("XM_zm2019");
+//        dsc.setTypeConvert(new MySqlTypeConvert(){
+//            // 自定义数据库表字段类型转换【可选】
+//            @Override
+//            public IColumnType processTypeConvert(GlobalConfig globalConfig, String fieldType) {
+//                if ( fieldType.toLowerCase().contains( "datetime" ) ) {
+//                    return DbColumnType.DATE;
+//                }
+//                return super.processTypeConvert(globalConfig, fieldType);
+//            }
+//
+//        });
+//        mpg.setDataSource(dsc);
+//
+//        // 包配置
+//        PackageConfig pc = new PackageConfig();
+////        String packgeName = scanner("包名");
+////        String packgeName = "";
+//        pc.setParent("com.xunmei.system");
+//        pc.setController("controller");
+//        pc.setEntity("domain" );
+//        pc.setService("service" );
+//        pc.setServiceImpl("service.impl");
+//        pc.setMapper("mapper");
+//        pc.setXml("mapper.xml");
+//        mpg.setPackageInfo(pc);
+//
+//        // 自定义配置
+//        InjectionConfig cfg = new InjectionConfig() {
+//            @Override
+//            public void initMap() {
+//                // to do nothing
+//            }
+//        };
+//
+//        // 如果模板引擎是 freemarker
+//        String templatePath = "/templates/mapper.xml.ftl";
+//
+//        // 自定义输出配置
+//        List<FileOutConfig> focList = new ArrayList<>();
+//        // 自定义配置会被优先输出
+//        focList.add(new FileOutConfig(templatePath) {
+//            @Override
+//            public String outputFile(TableInfo tableInfo) {
+//                // 自定义输出文件名 ， 如果你 Entity 设置了前后缀、此处注意 xml 的名称会跟着发生变化！！
+//                return projectPath + "/src/main/resources/mapper/system/"
+//                        + "/" + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
+//            }
+//        });
+//
+//        cfg.setFileOutConfigList(focList);
+//        mpg.setCfg(cfg);
+//
+//        // 配置模板
+//        TemplateConfig templateConfig = new TemplateConfig();
+//        templateConfig.setXml(null);
+//        mpg.setTemplate(templateConfig);
+//
+//        // 策略配置
+//        StrategyConfig strategy = new StrategyConfig();
+//        strategy.setNaming(NamingStrategy.underline_to_camel);
+//        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+//        strategy.setEntityLombokModel(true);
+//        strategy.setRestControllerStyle(true);
+//
+//        // 公共父类
+//        // 写于父类中的公共字段
+//        strategy.setInclude(scanner("表名，多个英文逗号分割").split(","));
+//        strategy.setControllerMappingHyphenStyle(true);
+//        strategy.setTablePrefix("t_","sys_");
+//        mpg.setStrategy(strategy);
+//        mpg.setTemplateEngine(new FreemarkerTemplateEngine());
+//        mpg.execute();
+//    }
+//}

soc-modules/soc-modules-system/src/main/java/com/xunmei/resumption/controller/AppRuleController.java

@@ -3,6 +3,7 @@ package com.xunmei.resumption.controller;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.common.security.annotation.RequiresPermissions;
 import com.xunmei.resumption.domain.AppRule;
 import com.xunmei.resumption.dto.appRule.AppRuleEditDto;
 import com.xunmei.resumption.service.IAppRuleService;
@@ -22,53 +23,59 @@ import java.util.List;
  * @since 2022-04-26
  */
 @RestController()
-@RequestMapping("/resumption/rule/")
+@RequestMapping("/resumption/rule")
 public class AppRuleController  extends BaseController {
 
     @Resource(name = "appRuleService")
     private IAppRuleService appRuleService;
 
     @ApiOperation(value = "查询规范列表")
-    @PostMapping("page")
+    @GetMapping("/page")
+    @RequiresPermissions("resumption:rule:list")
     public TableDataInfo getAppRulePage(@RequestBody AppRule appRule) {
         final TableDataInfo appRulePage = appRuleService.getAppRulePage(appRule);
         return appRulePage;
     }
 
     @ApiOperation(value = "查询所有规范")
-    @GetMapping("all")
+    @GetMapping("/all")
+    @RequiresPermissions("resumption:rule:list")
     public AjaxResult getAllAppRule() {
         final List<AppRulePageVo> appRulePage = appRuleService.getAllAppRule();
         return success(appRulePage);
     }
+
     @ApiOperation(value = "规范详情")
-    @GetMapping("info/{id}")
+    @GetMapping("/info/{id}")
+    @RequiresPermissions("resumption:rule:info")
     public AjaxResult info(@PathVariable Long id) {
         return success(appRuleService.get(id));
     }
 
     @ApiOperation(value = "新增/编辑规范")
-    @PostMapping("edit")
+    @PostMapping("/edit")
+    @RequiresPermissions("resumption:rule:add")
     public AjaxResult add(@RequestBody AppRuleEditDto appRuleEditDto) {
         return success(appRuleService.edit(appRuleEditDto));
     }
 
-    @ApiOperation(value = "检查手册规范类型在检查项、检查要点是否一致")
-    @GetMapping("check/{id}/{ruletype}")
-    public AjaxResult checkRuleType(@PathVariable Long id,@PathVariable int ruletype) {
-        return success(appRuleService.checkRuleTypeUniformity(id,ruletype));
-    }
+//    @ApiOperation(value = "检查手册规范类型在检查项、检查要点是否一致")
+//    @GetMapping("check/{id}/{ruletype}")
+//    public AjaxResult checkRuleType(@PathVariable Long id,@PathVariable int ruletype) {
+//        return success(appRuleService.checkRuleTypeUniformity(id,ruletype));
+//    }
 
     @ApiOperation(value = "删除规范")
-    @GetMapping("del/{id}")
+    @DeleteMapping("/del/{id}")
+    @RequiresPermissions("resumption:rule:delete")
     public AjaxResult del(@PathVariable Long id) {
         appRuleService.del(id);
         return success();
     }
 
-    @ApiOperation(value = "规范组")
-    @PostMapping("group")
-    public AjaxResult getRuleGroupList() {
-        return success(appRuleService.getRuleGroupList());
-    }
+//    @ApiOperation(value = "规范组")
+//    @PostMapping("group")
+//    public AjaxResult getRuleGroupList() {
+//        return success(appRuleService.getRuleGroupList());
+//    }
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/resumption/service/impl/AppRuleItemServiceImpl.java

@@ -14,7 +14,6 @@ import com.xunmei.resumption.mapper.AppRuleItemMapper;
 import com.xunmei.resumption.mapper.AppRuleMapper;
 import com.xunmei.resumption.mapper.AppRulePointMapper;
 import com.xunmei.resumption.dto.appRuleItem.AppRuleItemDto;
-import com.xunmei.resumption.dto.appRuleItem.AppRuleItemPageDto;
 import com.xunmei.resumption.dto.appRulePoint.AppRulePointDto;
 import com.xunmei.resumption.service.IAppRuleItemService;
 import com.xunmei.resumption.service.IAppRulePointService;

soc-modules/soc-modules-system/src/main/java/com/xunmei/resumption/service/impl/AppRuleServiceImpl.java

@@ -15,6 +15,7 @@ import com.xunmei.resumption.vo.appRule.AppRuleGroupVo;
 import com.xunmei.resumption.vo.appRule.AppRuleInfoVo;
 import com.xunmei.resumption.vo.appRule.AppRulePageVo;
 import com.xunmei.system.api.model.LoginUser;
+import com.xunmei.common.core.util.IDHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysWorkTimeSetServiceImpl.java

@@ -17,9 +17,17 @@ import com.xunmei.system.domain.SysWorkTime;
 import com.xunmei.system.domain.SysWorkTimeSetDayofweek;
 import com.xunmei.system.mapper.SysWorkTimeMapper;
 import com.xunmei.system.mapper.SysWorkTimeSetDayofweekMapper;
+<<<<<<< .mine
+import com.xunmei.common.core.util.BeanHelper;
+=======
 import com.xunmei.system.util.StreamHelper;
-import com.xunmei.util.BeanHelper;
+>>>>>>> .theirs
+import com.xunmei.common.core.util.DateHelper;
+<<<<<<< .mine
+
+=======
 import com.xunmei.util.DateHelper;
+>>>>>>> .theirs
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

soc-modules/soc-modules-system/src/main/java/com/xunmei/util/Generator.java

@@ -1,147 +0,0 @@
-package com.xunmei.util;
-
-import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.generator.AutoGenerator;
-import com.baomidou.mybatisplus.generator.InjectionConfig;
-import com.baomidou.mybatisplus.generator.config.*;
-import com.baomidou.mybatisplus.generator.config.converts.MySqlTypeConvert;
-import com.baomidou.mybatisplus.generator.config.po.TableInfo;
-import com.baomidou.mybatisplus.generator.config.rules.DbColumnType;
-import com.baomidou.mybatisplus.generator.config.rules.IColumnType;
-import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Scanner;
-
-/**
- * @author luojun
- * @date 2022/8/11 16:41
- */
-public class Generator {
-    /**
-     * <p>
-     * 读取控制台内容
-     * </p>
-     */
-    public static String scanner(String tip) {
-        Scanner scanner = new Scanner(System.in);
-        StringBuilder help = new StringBuilder();
-        help.append("请输入" + tip + "：");
-        System.out.println(help.toString());
-        if (scanner.hasNext()) {
-            String ipt = scanner.next();
-            if (StringUtils.isNotEmpty(ipt)) {
-                return ipt;
-            }
-        }
-        throw new MybatisPlusException("请输入正确的" + tip + "！");
-    }
-
-    public static void main(String[] args) {
-        // 代码生成器
-        AutoGenerator mpg = new AutoGenerator();
-
-        // 全局配置
-        GlobalConfig gc = new GlobalConfig();
-        String projectPath = System.getProperty("user.dir")+"\\soc-modules\\soc-modules-system" ;
-        gc.setOutputDir(projectPath + "/src/main/java");
-        gc.setAuthor("luojun");
-        gc.setOpen(false);
-        //是否覆盖文件
-        gc.setFileOverride(false);
-        // xml resultmap
-        gc.setBaseResultMap(true);
-        // xml columlist
-        gc.setBaseColumnList(true);
-        //实体属性 Swagger2 注解
-        gc.setSwagger2(true);
-        mpg.setGlobalConfig(gc);
-
-        // 数据源配置
-        DataSourceConfig dsc = new DataSourceConfig();
-//        dsc.setUrl("jdbc:mysql://10.87.10.54:3306/soc");
-//        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
-//        dsc.setUsername("root");
-//        dsc.setPassword("XM_zm2019");
-        dsc.setUrl("jdbc:mysql://10.87.11.94:3306/soc");
-        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
-        dsc.setUsername("root");
-        dsc.setPassword("XM_zm2019");
-        dsc.setTypeConvert(new MySqlTypeConvert(){
-            // 自定义数据库表字段类型转换【可选】
-            @Override
-            public IColumnType processTypeConvert(GlobalConfig globalConfig, String fieldType) {
-                if ( fieldType.toLowerCase().contains( "datetime" ) ) {
-                    return DbColumnType.DATE;
-                }
-                return super.processTypeConvert(globalConfig, fieldType);
-            }
-
-        });
-        mpg.setDataSource(dsc);
-
-        // 包配置
-        PackageConfig pc = new PackageConfig();
-//        String packgeName = scanner("包名");
-//        String packgeName = "";
-        pc.setParent("com.xunmei.system");
-        pc.setController("controller");
-        pc.setEntity("domain" );
-        pc.setService("service" );
-        pc.setServiceImpl("service.impl");
-        pc.setMapper("mapper");
-        pc.setXml("mapper.xml");
-        mpg.setPackageInfo(pc);
-
-        // 自定义配置
-        InjectionConfig cfg = new InjectionConfig() {
-            @Override
-            public void initMap() {
-                // to do nothing
-            }
-        };
-
-        // 如果模板引擎是 freemarker
-        String templatePath = "/templates/mapper.xml.ftl";
-
-        // 自定义输出配置
-        List<FileOutConfig> focList = new ArrayList<>();
-        // 自定义配置会被优先输出
-        focList.add(new FileOutConfig(templatePath) {
-            @Override
-            public String outputFile(TableInfo tableInfo) {
-                // 自定义输出文件名 ， 如果你 Entity 设置了前后缀、此处注意 xml 的名称会跟着发生变化！！
-                return projectPath + "/src/main/resources/mapper/system/"
-                        + "/" + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
-            }
-        });
-
-        cfg.setFileOutConfigList(focList);
-        mpg.setCfg(cfg);
-
-        // 配置模板
-        TemplateConfig templateConfig = new TemplateConfig();
-        templateConfig.setXml(null);
-        mpg.setTemplate(templateConfig);
-
-        // 策略配置
-        StrategyConfig strategy = new StrategyConfig();
-        strategy.setNaming(NamingStrategy.underline_to_camel);
-        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
-        strategy.setEntityLombokModel(true);
-        strategy.setRestControllerStyle(true);
-
-        // 公共父类
-        // 写于父类中的公共字段
-        strategy.setInclude(scanner("表名，多个英文逗号分割").split(","));
-        strategy.setControllerMappingHyphenStyle(true);
-        strategy.setTablePrefix("t_","sys_");
-        mpg.setStrategy(strategy);
-        mpg.setTemplateEngine(new FreemarkerTemplateEngine());
-        mpg.execute();
-    }
-}