diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java index d313212..3ee2dbb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java @@ -6,6 +6,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import io.swagger.annotations.Api; +<<<<<<< HEAD +import io.swagger.annotations.ApiImplicitParam; +======= +>>>>>>> c3cde44 (新增手机短信登录模块) import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -79,6 +83,10 @@ public class CommonController */ @PostMapping("/upload") @ApiOperation("通用上传请求（单个）") +<<<<<<< HEAD + @ApiImplicitParam(name = "file", value = "文件", required = true) +======= +>>>>>>> c3cde44 (新增手机短信登录模块) public AjaxResult uploadFile(MultipartFile file) throws Exception { try diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 00b74f0..63d8743 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -13,9 +13,18 @@ spring: slave: # 从数据源开关/默认关闭 enabled: true +<<<<<<< HEAD + url: jdbc:kingbase8://192.168.0.80:54321/nbzh?useUnicode=true&allowMultiQueries=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true¤tSchema=nbzh,SYS_CATALOG + username: system + password: 'WaTu123!@#' +# url: jdbc:mysql://192.168.0.80:55306/nbzh?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: root +# password: '!QAZ1qaz' +======= url: jdbc:mysql://192.168.0.80:55306/nbzh?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: '!QAZ1qaz' +>>>>>>> c3cde44 (新增手机短信登录模块) # 初始连接数 initialSize: 5 # 最小连接池数量 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index c72b9a0..869fefd 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -9,7 +9,7 @@ ruoyi: # 实例演示开关 demoEnabled: true # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profile: D:/ruoyi/uploadPath + profile: /home/project/nbzhpc/pic # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数组计算 char 字符验证 @@ -70,10 +70,14 @@ spring: # redis 配置 redis: # 地址 +<<<<<<< HEAD + host: 1.94.45.26 +======= # host: 120.195.33.173 host: 192.168.0.78 +>>>>>>> c3cde44 (新增手机短信登录模块) # 端口，默认为6379 - port: 26379 + port: 10052 # 数据库索引 database: 10 # 密码 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java index 8c1d99a..94a99cf 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java @@ -67,7 +67,7 @@ public class Constants /** * 验证码有效期（分钟） */ - public static final Integer CAPTCHA_EXPIRATION = 2; + public static final Integer CAPTCHA_EXPIRATION = 10; /** * 令牌 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java index 7e3033c..cfa44fd 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java @@ -45,7 +45,7 @@ public class BaseEntity implements Serializable /** 更新时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @TableField(exist = false) +// @TableField(exist = false) @ApiModelProperty(hidden = true) private Date updateTime; diff --git a/ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingController.java b/ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingController.java index f83005f..dc09379 100644 --- a/ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingController.java +++ b/ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingController.java @@ -101,8 +101,13 @@ public class TbCompanyInformationReportingController extends BaseController { if(tbCompanyInformationReporting.getDetails()==null||tbCompanyInformationReporting.getDetails().size()<1){ return error("上报详情信息三项不能都为空"); } + boolean sing=false; List details = tbCompanyInformationReporting.getDetails(); for (TbCompanyInformationReportingDetails detail : details) { + if(StringUtils.isBlank(detail.getDataType())){ + sing=true; + break; + } if(tbCompanyInformationReportingDetailsService.group1FieldsEmptyByCompanyThreePreventionData(detail)){ tbCompanyInformationReporting.setCompanyThreePreventionData("0"); }else { @@ -120,8 +125,14 @@ public class TbCompanyInformationReportingController extends BaseController { } detail.setCreateTime(DateUtils.getNowDate()); } + if(sing){ + return error("上报详情类型为空"); + } tbCompanyInformationReporting.setReportState("1"); int i = tbCompanyInformationReportingService.insertTbCompanyInformationReporting(tbCompanyInformationReporting); + for (TbCompanyInformationReportingDetails detail : details){ + detail.setCompanyInformationReportingId(tbCompanyInformationReporting.getId()); + } boolean saveBatch = tbCompanyInformationReportingDetailsService.saveBatch(details); if(!saveBatch){ i=0; @@ -219,9 +230,12 @@ public class TbCompanyInformationReportingController extends BaseController { } /** - * 修改企业信息上报 + *上报提交 */ @PutMapping("/changeState") + @ApiOperation("上报提交") + @ApiOperationSupport(author = "张二富", order = 20) + @ApiImplicitParam(name = "id", value = "企业信息上报id 列表返回的id", required = true) public AjaxResult changeState(@RequestBody TbCompanyInformationReporting tbCompanyInformationReporting){ UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq(StringUtils.camelToUnderline(TbCompanyInformationReporting.Fields.id),tbCompanyInformationReporting.getId()); diff --git a/ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReportingDetails.java b/ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReportingDetails.java index a49b230..b5df77a 100644 --- a/ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReportingDetails.java +++ b/ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReportingDetails.java @@ -49,6 +49,11 @@ public class TbCompanyInformationReportingDetails extends BaseEntity @ApiModelProperty(value = "巡逻人员数", position = 20) private String patrolNum; + /** 夜班人员数 */ + @Excel(name = "夜班人员数") + @ApiModelProperty(value = "夜班人员数", position = 21) + private String nightShiftNum; + /** 应急处理人员数 */ @Excel(name = "应急处理人员数") @ApiModelProperty(value = "应急处理人员数", position = 25) diff --git a/ruoyi-safecompany/src/main/resources/mapper/system/TbCompanyInformationReportingDetailsMapper.xml b/ruoyi-safecompany/src/main/resources/mapper/system/TbCompanyInformationReportingDetailsMapper.xml index 96a9509..fe91c17 100644 --- a/ruoyi-safecompany/src/main/resources/mapper/system/TbCompanyInformationReportingDetailsMapper.xml +++ b/ruoyi-safecompany/src/main/resources/mapper/system/TbCompanyInformationReportingDetailsMapper.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/ruoyi-safecompany/src/main/resources/mapper/system/TbCompanyInformationReportingMapper.xml b/ruoyi-safecompany/src/main/resources/mapper/system/TbCompanyInformationReportingMapper.xml index bb49c8b..b8756f6 100644 --- a/ruoyi-safecompany/src/main/resources/mapper/system/TbCompanyInformationReportingMapper.xml +++ b/ruoyi-safecompany/src/main/resources/mapper/system/TbCompanyInformationReportingMapper.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 40d4bab..e57e7d9 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -183,7 +183,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{nickName}, #{email}, #{avatar}, - #{phone_number}, + #{phoneNumber}, #{sex}, #{password}, #{status}, diff --git a/ruoyi-ui-vue3/.env.development b/ruoyi-ui-vue3/.env.development index 7b59769..b02a398 100644 --- a/ruoyi-ui-vue3/.env.development +++ b/ruoyi-ui-vue3/.env.development @@ -5,4 +5,4 @@ VITE_APP_TITLE = 安惠商企管理系统 VITE_APP_ENV = 'development' # 若依管理系统/开发环境 -VITE_APP_BASE_API = '/dev-api' +VITE_APP_BASE_API = '/zhpcapi/zhpcapi' diff --git a/ruoyi-ui-vue3/vite.config.js b/ruoyi-ui-vue3/vite.config.js index db35bb2..5b33c05 100644 --- a/ruoyi-ui-vue3/vite.config.js +++ b/ruoyi-ui-vue3/vite.config.js @@ -30,10 +30,14 @@ export default defineConfig(({ mode, command }) => { open: true, proxy: { // https://cn.vitejs.dev/config/#server-proxy +<<<<<<< HEAD + '/zhpcapi': { +======= '/dev-api': { +>>>>>>> c3cde44 (新增手机短信登录模块) target: 'http://localhost:8799', changeOrigin: true, - rewrite: (p) => p.replace(/^\/dev-api/, '') + rewrite: (p) => p.replace(/^\/zhpcapi/, '') } } },