Merge remote-tracking branch 'origin/qionglai' into qionglai

attendance-performance-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthUserInterceptor.java

@@ -67,7 +67,7 @@ public class AuthUserInterceptor extends BaseInterceptor {
                         ret.put("msg", "用户未登录或登录失效，请重新登录");
                         ServletUtils.renderString(response, JSONObject.toJSONString(ret));
                         return false;
-                    }else if(loginUser.isAdmin()||loginUser.getUserType()==1){
+                    }else if(loginUser.isAdmin()||loginUser.getUserType()==1||loginUser.getUserType()==2||loginUser.getUserType()==3){
                         return super.preHandle(request, response, handler);
                     } else {
                         ret.put("code", -1);

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/ApiLoginController.java

@@ -142,6 +142,8 @@ public class ApiLoginController extends BaseJsonBodyController {
             ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
             ret.put(KEY_RESULT_MSG, "用户登录系统成功!");
             recordSysLog(request, userEntity, "钉钉用户登录系统成功!");
+
+            log.info("h5 login succ==>{}",ret.toJSONString());
             return ret.toJSONString();
         } catch (AppException e) {
             log.error("dinding login error ", e);

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/StaffCheckSummaryService.java

@@ -64,22 +64,22 @@ public class StaffCheckSummaryService implements IApplicationStartedService {
                 int waitTime = 50;
                 while (!stopped) {
                     try {
-                        StaffCheckSummaryQuery query = cacheService.brpop(KEY_CHECK_SUMMARY_CACHE,60, StaffCheckSummaryQuery.class);
-                        if(!ObjectUtils.isEmpty(query)){
-                            log.info("绩效分数汇总开始:"+ JSONObject.toJSONString(query));
-                            if(StringUtils.isNotEmpty(query.getCheckTimeStart())){
-                                Date date = DateUtil.parse(query.getCheckTimeStart(),"yyyy-MM-dd");
+                        StaffCheckSummaryQuery query = cacheService.brpop(KEY_CHECK_SUMMARY_CACHE, 60, StaffCheckSummaryQuery.class);
+                        if (!ObjectUtils.isEmpty(query)) {
+                            log.info("绩效分数汇总开始:" + JSONObject.toJSONString(query));
+                            if (StringUtils.isNotEmpty(query.getCheckTimeStart())) {
+                                Date date = DateUtil.parse(query.getCheckTimeStart(), "yyyy-MM-dd");
                                 query.setCheckTimeStart(DateUtil.beginOfMonth(date).toDateStr());
                                 query.setCheckTimeEnd(DateUtil.endOfMonth(date).toDateStr());
                                 query.setYear(DateUtil.year(date));
-                                int checkMonth = DateUtil.month(date)+1;
+                                int checkMonth = DateUtil.month(date) + 1;
                                 query.setMonth(checkMonth);
                                 Date now = new Date();
-                                int nowMonth = DateUtil.month(now)+1;
-                                if(checkMonth==nowMonth){
+                                int nowMonth = DateUtil.month(now) + 1;
+                                if (checkMonth == nowMonth) {
                                     //汇总当月绩效
                                     Calendar calendar = Calendar.getInstance();
-                                    calendar.add(Calendar.DAY_OF_MONTH,-1);
+                                    calendar.add(Calendar.DAY_OF_MONTH, -1);
                                     query.setCheckTimeEnd(DateUtils.getStrDate(calendar.getTime()));
                                     query.setCheckTimeStart(DateUtil.beginOfMonth(calendar.getTime()).toDateStr());
                                 }
@@ -103,34 +103,34 @@ public class StaffCheckSummaryService implements IApplicationStartedService {
                             staffPerformSummaryEntity.setErrorScore(BigDecimal.ZERO);
                             //staffPerformSummaryEntity.setSumScore(StaffPerformUtil.SCORE100);
                             staffPerformSummaryEntity.setUpdateTime(new Date());
-                            Map<String,Object> condition = new HashMap<>();
-                            condition.put("year",year);
-                            condition.put("month",month);
-                            if(query.getStaffId()!=null){
-                                condition.put("staffId",query.getStaffId());
+                            Map<String, Object> condition = new HashMap<>();
+                            condition.put("year", year);
+                            condition.put("month", month);
+                            if (query.getStaffId() != null) {
+                                condition.put("staffId", query.getStaffId());
                             }
                             //staffPerformSummaryService.getDao().update(staffPerformSummaryEntity,condition);
                             staffPerformSummaryService.getDao().updateSumScore(condition);
-                            if(query.getCheckType() == CheckTypeEnum.考勤绩效.getValue()){
+                            if (query.getCheckType() == CheckTypeEnum.考勤绩效.getValue()) {
                                 checkAttendRecordService.summaryCheck(query);
                             }
-                            if(query.getCheckType() == CheckTypeEnum.效能绩效.getValue()){
+                            if (query.getCheckType() == CheckTypeEnum.效能绩效.getValue()) {
                                 checkEffectRecordService.summaryCheck(query);
                             }
-                            if(query.getCheckType() == CheckTypeEnum.办件绩效.getValue()){
+                            if (query.getCheckType() == CheckTypeEnum.办件绩效.getValue()) {
                                 checkGoworkRecordService.summaryCheck(query);
                             }
-                            if(query.getCheckType() == CheckTypeEnum.评价绩效.getValue()){
+                            if (query.getCheckType() == CheckTypeEnum.评价绩效.getValue()) {
                                 checkReviewRecordService.summaryCheck(query);
                                 checkComplainRecordService.summaryCheck(query);
                             }
-                            if(query.getCheckType() == CheckTypeEnum.自评绩效.getValue()){
+                            if (query.getCheckType() == CheckTypeEnum.自评绩效.getValue()) {
                                 checkWindowWorkmanPerformService.summaryCheck(query);
                             }
-                            if(query.getCheckType() == CheckTypeEnum.其它绩效.getValue()){
+                            if (query.getCheckType() == CheckTypeEnum.其它绩效.getValue()) {
                                 checkOtherRecordService.summaryCheck(query);
                             }
-                            if(query.getCheckType()==null){
+                            if (query.getCheckType() == null) {
 
                                 checkAttendRecordService.summaryCheck(query);
                                 checkEffectRecordService.summaryCheck(query);
@@ -151,12 +151,10 @@ public class StaffCheckSummaryService implements IApplicationStartedService {
                         } catch (InterruptedException e2) {
                         }
 
-                    } catch (Exception e) {
-                        if(e instanceof QueryTimeoutException){
+                    } catch (QueryTimeoutException e) {
 
-                        }else {
+                    } catch (Exception e) {
                         log.error("绩效分数汇总异常", e);
-                        }
                         try {
                             Thread.sleep(waitTime);
                         } catch (InterruptedException e2) {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/service/impl/DeptServiceImpl.java

@@ -174,7 +174,6 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity
         List<DeptEntity> returnList = list.stream().filter(t -> t.getParentId() == 0).map(
                 m -> {
                     m.setChildren(getChildren(m, list));
-
                     StaffQuery query = new StaffQuery();
                     query.setStatusNotList(Arrays.asList(StaffSatusEnum.离职.getValue()));
                     query.setDeptIdList(getChildrenId(m, list));

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java

@@ -15,9 +15,11 @@ import com.mortals.xhx.base.system.role.model.RoleUserQuery;
 import com.mortals.xhx.base.system.role.service.RoleUserService;
 import com.mortals.xhx.base.system.upload.service.UploadService;
 import com.mortals.xhx.base.system.user.model.UserEntity;
+import com.mortals.xhx.base.system.user.model.UserQuery;
 import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.common.code.*;
 import com.mortals.xhx.common.utils.BeanUtil;
+import com.mortals.xhx.common.utils.PinYinUtils;
 import com.mortals.xhx.module.attendance.model.*;
 import com.mortals.xhx.module.attendance.service.AttendanceStatService;
 import com.mortals.xhx.module.attendance.service.AttendanceVacationBalanceService;
@@ -358,7 +360,9 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
             UserEntity userEntity = new UserEntity();
             if (ObjectUtils.isEmpty(entity.getLoginName())) {
                 //姓名加工号作为登录名
-                entity.setLoginName(entity.getName() + entity.getWorkNum());
+                //  entity.setLoginName(entity.getName() + entity.getWorkNum());
+                entity.setLoginName(PinYinUtils.getHanziPinYin(entity.getName())
+                );
             }
             if (ObjectUtils.isEmpty(entity.getLoginPwd())) {
                 //设置初始密码
@@ -390,6 +394,26 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
 
     }
 
+    @Override
+    protected void updateAfter(StaffEntity entity, Context context) throws AppException {
+        super.updateAfter(entity, context);
+
+        //更新登录名
+        UserQuery userQuery = new UserQuery();
+        userQuery.setCustomerId(entity.getId());
+
+        UserEntity userEntity = userService.selectOne(userQuery);
+        if (!ObjectUtils.isEmpty(userEntity)) {
+
+            UserEntity condition = new UserEntity();
+            condition.setId(userEntity.getId());
+
+            UserEntity user = new UserEntity();
+            user.setLoginName(PinYinUtils.getHanziPinYin(entity.getName()));
+            userService.getUserDao().update(user, condition);
+        }
+
+    }
 
     @Override
     protected void removeAfter(Long[] ids, Context context, int result) throws AppException {

attendance-performance-manager/src/test/java/com/mortals/httpclient/http-client.env.json

@@ -28,5 +28,11 @@
 
   "portal-yibin": {
     "baseUrl": "http://112.19.80.237:11078/zwfw"
+  },
+  "qionglai": {
+    "baseUrl": "http://172.54.191.130:11039/attend"
   }
+
+
+
 }
\ No newline at end of file

attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http

@@ -4,8 +4,8 @@ POST {{baseUrl}}/login/login
 Content-Type: application/json
 
 {
-  "loginName": "admin",
-  "password": "xhxADMIN8@a",
+  "loginName": "zhangyewei",
+  "password": "123456",
   "securityCode": "admin"
 }
 
@@ -14,6 +14,34 @@ client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
 client.global.set("authToken", JSON.parse(response.body).data.token);
 %}
 
+###登录
+POST {{baseUrl}}/api/v1/login/login
+Content-Type: application/json
+
+{
+  "loginName": "zhangyewei",
+  "password": "123456",
+  "code": "admin"
+}
+
+> {%
+    client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
+    client.global.set("authToken", JSON.parse(response.body).data.token);
+%}
+
+
+###登录
+POST http://10.233.82.175:11078/zwfw/login/login
+Content-Type: application/json
+
+{
+  "loginName": "xinhx",
+  "password": "xhxX123!@#",
+  "securityCode": "admin"
+}
+
+
+
 
 ###登录
 POST http://10.233.82.175:11078/zwfw/login/login

common-lib/pom.xml

@@ -94,6 +94,11 @@
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
     </dependencies>