ZheJiangNingBo
/
SafeCompanyPC
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0709恢复到短信完好前1

Browse Source
master
Bbt 2 months ago
parent c3cde443ed
commit 645f8eb68e
12 changed files with 54 additions and 10 deletions
Show Stats Download Patch File Download Diff File

8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
Unescape View File

@ -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

9
ruoyi-admin/src/main/resources/application-druid.yml
Unescape View File

@ -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&currentSchema=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
# 最小连接池数量

8
ruoyi-admin/src/main/resources/application.yml
Unescape View File

@ -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
# 密码

2
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
Unescape View File

@ -67,7 +67,7 @@ public class Constants
/**
* 验证码有效期（分钟）
*/
public static final Integer CAPTCHA_EXPIRATION = 2;
public static final Integer CAPTCHA_EXPIRATION = 10;
/**
* 令牌

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
Unescape View File

@ -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;

16
ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/controller/TbCompanyInformationReportingController.java
Unescape View File

@ -101,8 +101,13 @@ public class TbCompanyInformationReportingController extends BaseController {
if(tbCompanyInformationReporting.getDetails()==null||tbCompanyInformationReporting.getDetails().size()<1){
return error("上报详情信息三项不能都为空");
}
boolean sing=false;
List<TbCompanyInformationReportingDetails> 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<TbCompanyInformationReporting> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq(StringUtils.camelToUnderline(TbCompanyInformationReporting.Fields.id),tbCompanyInformationReporting.getId());

5
ruoyi-safecompany/src/main/java/com/ruoyi/business/companyInformationReporting/domain/TbCompanyInformationReportingDetails.java
Unescape View File

@ -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)

2
ruoyi-safecompany/src/main/resources/mapper/system/TbCompanyInformationReportingDetailsMapper.xml
Unescape View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruyi.business.companyInformationReporting.mapper.TbCompanyInformationReportingDetailsMapper">
<mapper namespace="com.ruoyi.business.companyInformationReporting.mapper.TbCompanyInformationReportingDetailsMapper">
</mapper>

2
ruoyi-safecompany/src/main/resources/mapper/system/TbCompanyInformationReportingMapper.xml
Unescape View File

@ -2,6 +2,6 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruyi.business.companyInformationReporting.mapper.TbCompanyInformationReportingMapper">
<mapper namespace="com.ruoyi.business.companyInformationReporting.mapper.TbCompanyInformationReportingMapper">
</mapper>

2
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
Unescape View File

@ -183,7 +183,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="nickName != null and nickName != ''">#{nickName},</if>
<if test="email != null and email != ''">#{email},</if>
<if test="avatar != null and avatar != ''">#{avatar},</if>
<if test="phoneNumber != null and phoneNumber != ''">#{phone_number},</if>
<if test="phoneNumber != null and phoneNumber != ''">#{phoneNumber},</if>
<if test="sex != null and sex != ''">#{sex},</if>
<if test="password != null and password != ''">#{password},</if>
<if test="status != null and status != ''">#{status},</if>

2
ruoyi-ui-vue3/.env.development
Unescape View File

@ -5,4 +5,4 @@ VITE_APP_TITLE = 安惠商企管理系统
VITE_APP_ENV = 'development'
# 若依管理系统/开发环境
VITE_APP_BASE_API = '/dev-api'
VITE_APP_BASE_API = '/zhpcapi/zhpcapi'

6
ruoyi-ui-vue3/vite.config.js
Unescape View File

@ -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/, '')
}
}
},

Write Preview
Loading…
Cancel
Save