wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

优化BUG

dev
xiepeng 2024-07-08 08:27:36 +08:00
parent adf706ba76
commit 14261c4f45
9 changed files with 62 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java
View File

@ -12,7 +12,9 @@ import com.zcloud.util.*;
import freemarker.template.SimpleDate;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.util.CollectionUtils;
import org.jose4j.lang.StringUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@ -23,6 +25,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@Controller

5
src/main/java/com/zcloud/controller/eduApp/AppUsersCacheController.java
View File

@ -1,6 +1,7 @@
package com.zcloud.controller.eduApp;
import com.zcloud.controller.base.BaseController;
import com.zcloud.mapper.datasource.system.UsersMapper;
import com.zcloud.mapper.dsno3.eduStudy.StudentMapper;
import com.zcloud.service.eduArchives.ArchivesStudentService;
import com.zcloud.service.eduStudy.FaceImgLogService;
@ -55,6 +56,9 @@ public class AppUsersCacheController extends BaseController {
@Autowired
private UserInfoService userInfoService;
@Autowired
private UsersMapper usersMapper;
//@RequestMapping("/getUser")
public Response getUser() throws Exception {
Response response = Response.getResponse();
@ -166,6 +170,7 @@ public class AppUsersCacheController extends BaseController {
user.put("PORTRAIT", Const.FILEPATHFACE + ffile + "/" + fileName);
userInfoService.editUserInfo(user);
map.put("result", errInfo);
usersMapper.editFace(pd);
return map;
}

2
src/main/java/com/zcloud/controller/eduStudy/PostTypeController.java
View File

@ -58,7 +58,7 @@ public class PostTypeController extends BaseController {
/**
* 删除
*
* @param out
* @param
* @throws Exception
*/
@RequestMapping(value = "/delete")

2
src/main/java/com/zcloud/controller/scheduling/ShiftWorkRulesController.java
View File

@ -96,7 +96,7 @@ public class ShiftWorkRulesController extends BaseController {
pd = this.getPageData();
pd.put("SHIFTDUTYONE", pd.get("SHIFTWORKRULES_ID"));
int count = shiftworkrulesService.isUseOne(pd);
if(count == '0') {
if(count == 0) {
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
shiftWorkPeriodService.deleteByUpRules(pd);

2
src/main/java/com/zcloud/controller/system/FHlogController.java
View File

@ -120,7 +120,7 @@ public class FHlogController extends BaseController {
String STARTTIME = pd.getString("STARTTIME"); //开始时间
String ENDTIME = pd.getString("ENDTIME"); //结束时间
if(Tools.notEmpty(STARTTIME))npd.put("STARTTIME", STARTTIME+" 00:00:00");
if(Tools.notEmpty(ENDTIME))npd.put("ENDTIME", ENDTIME+" 00:00:00");
if(Tools.notEmpty(ENDTIME))npd.put("ENDTIME", ENDTIME+" 23:59:59");
npd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
npd.put("ISMAIN", Jurisdiction.getIS_MAIN());
npd.put("ISSUPERVISE", Jurisdiction.getISSUPERVISE());

14
src/main/java/com/zcloud/controller/system/UsersController.java
View File

@ -1,8 +1,10 @@
package com.zcloud.controller.system;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON;
import com.mchange.v2.codegen.bean.BeangenUtils;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.EmployeeData;
import com.zcloud.entity.Page;
@ -23,6 +25,7 @@ import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.crypto.hash.SimpleHash;
import org.apache.shiro.util.CollectionUtils;
import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@ -95,7 +98,7 @@ public class UsersController extends BaseController {
/**
* 根据卡号找人信息
*
* @param page
* @param
* @return
* @throws Exception
*/
@ -110,7 +113,7 @@ public class UsersController extends BaseController {
/**
* 根据USERID找人
*
* @param page
* @param
* @return
* @throws Exception
*/
@ -160,7 +163,6 @@ public class UsersController extends BaseController {
List<PageData> userList = usersService.userlistPage(page); //列出用户列表
pd.put("ROLE_ID", Jurisdiction.getVIPLEVEL());
List<Role> roleList = roleService.listAllRolesByPId(pd); //列出所有系统用户角色
map.put("userList", userList);
map.put("roleList", roleList);
map.put("ROLE_ID", ROLE_ID);
@ -727,6 +729,7 @@ public class UsersController extends BaseController {
map.put("result", errInfo); //返回结果
return map;
}
/**
* 判断用户名是否存在
*
@ -2215,7 +2218,6 @@ public class UsersController extends BaseController {
*
* @param parentId 部门父节点id
* @param departMap 全部部门信息
* @param valName 部门名称
* @return 从子节点开始往上循序
*/
public String getParentName(String parentId, Map<String, Object> departMap) {
@ -2253,7 +2255,7 @@ public class UsersController extends BaseController {
/**
* 查询公司所有用户
*
* @param page
* @param
* @throws Exception
*/
@RequestMapping(value = "/listUserByCorp")
@ -2629,6 +2631,7 @@ public class UsersController extends BaseController {
/**
* 去修改用户页面(从系统用户页面修改)
* // goEditUser
*
* @return
* @throws Exception
*/
@ -3052,7 +3055,6 @@ public class UsersController extends BaseController {
}
@RequestMapping("/getTrafficPenaltyUserList")
@ResponseBody
public Object getTrafficPenaltyUserList(Page page) throws Exception {

1
src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
View File

@ -304,4 +304,5 @@ public interface UsersMapper {
List<PageData> getUserNoCorpinfoListAll(Page page);
void editFace(PageData pd);
}

4
src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
View File

@ -1344,14 +1344,14 @@ public class UsersServiceImpl implements UsersService {
pd.put("USER_ID",userId);
usersMapper.editUser(pd);
return ReturnMap.ok();*/
if (pd.get("USERAVATARURL") != null && !pd.getString("USERAVATARURL").equals("")) {
/*if (pd.get("USERAVATARURL") != null && !pd.getString("USERAVATARURL").equals("")) {
String USERAVATARURL64 = ImageAnd64Binary.zipBase64(pd.getString("USERAVATARURL"));
try {
FaceUtil.compareFace(pd.getString("USERAVATARURL"), pd.getString("USERAVATARURL"));
} catch (Exception e) {
return ReturnMap.ok("1");
}
}
}*/
/*if (!IdcardUtils.validateCard(pd.getString("USER_ID_CARD"))) {
return ReturnMap.error("身份证号校验不通过，请核对信息");
}*/

15
src/main/resources/mybatis/datasource/system/UsersMapper.xml
View File

@ -2061,4 +2061,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by c.CREATTIME desc
</select>
<update id="editFace" parameterType="pd" >
update
sys_user
SET
USER_ID = #{USER_ID}
<if test="USERAVATARPREFIX != null and USERAVATARPREFIX != ''"><!-- 关键词检索 -->
, USERAVATARPREFIX = #{USERAVATARPREFIX}
</if>
<if test="USERAVATARURL != null and USERAVATARURL != ''"><!-- 关键词检索 -->
, USERAVATARURL = #{USERAVATARURL}
</if>
where
USER_ID = #{USER_ID}
</update>
</mapper>