api加解密，金额字段类型

ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtProjectRecruitApplyController.java

@@ -48,7 +48,8 @@ public class AppBgtProjectRecruitApplyController extends BaseController {
 	 *
 	 */
 	@ApiOperation(value = "App务工者列表(分页)"
-		,notes = "务工者申请列表 状态 为报名-未选择(0)和通过-已选择(1)")
+		,notes = "务工者申请列表 状态 为报名-未选择(0)和通过-已选择(1) " +
+		         "总体考勤情况-进退场 状态为 进场(5)和退场(6) ")
 	@GetMapping("/list")
 	public TableDataInfo<BgtProjectRecruitApplyVO> listPage(@Validated BgtProjectRecruitApplyQueryDTO dto) {
 		return iBgtProjectRecruitApplyService.appQueryPageList(dto);
@@ -83,10 +84,10 @@ public class AppBgtProjectRecruitApplyController extends BaseController {
 	}
 
 
-	@ApiOperation("人员出勤情况")
+	@ApiOperation("总体考勤情况-人员出勤情况")
 	@GetMapping("/todayAttendanceList")
-	public AjaxResult<List<BgtProjectRecruitApplyVO>> todayAttendanceList(@Validated BgtAttendanceDayDTO req) {
-		return AjaxResult.success(iBgtProjectRecruitApplyService.todayAttendanceList(req));
+	public TableDataInfo<BgtProjectRecruitApplyVO> todayAttendanceList(@Validated BgtAttendanceDayDTO req) {
+		return iBgtProjectRecruitApplyService.dayAttendanceList(req);
 	}
 
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtUserController.java

@@ -53,4 +53,16 @@ public class AppBgtUserController extends BaseController {
 		return AjaxResult.success(iBgtUserService.queryById(id));
 	}
 
+
+	/**
+	 * 修改后台管理包工头
+	 */
+	@ApiOperation("修改后台管理包工头")
+	@Log(title = "后台管理包工头", businessType = BusinessType.UPDATE)
+	@RepeatSubmit
+	@PutMapping("/edit")
+	public AjaxResult<Boolean> edit(@Validated @RequestBody BgtUser bo) {
+		return AjaxResult.success(iBgtUserService.update(bo));
+	}
+
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/AppLoginController.java

@@ -9,6 +9,7 @@ import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.BgtLoginBody;
 import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.util.DataUtil;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.framework.web.service.AppLoginService;
 import com.ruoyi.framework.web.service.SysPermissionService;
@@ -38,7 +39,7 @@ import java.util.Map;
 @Api(value = "App登录验证", tags = {"App登录验证"})
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-public class AppLoginController
+public class  AppLoginController
 {
     @Autowired
     private AppLoginService loginService;
@@ -95,6 +96,7 @@ public class AppLoginController
 		switch (userType){
 			case Constants.BGT:
 				BgtUser bgtUser = iBgtUserService.selectUserByPhone(user.getPhonenumber());
+				bgtUser.setAge(DataUtil.calculateAge(bgtUser.getBirthdate()));
 				ajax.put("user", bgtUser);
 				break;
 			case Constants.WGZ:

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/TestController.java

@@ -0,0 +1,22 @@
+package com.ruoyi.web.controller.common;
+
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+public class TestController {
+
+	@PostMapping("/test")
+	public String test(@RequestBody String data) {
+		System.out.println(data);
+		return "Received: " + data;
+	}
+
+	@GetMapping("/testGet")
+	public String testGet(String data,Long taskId) {
+		System.out.println("data:"+data);
+		System.out.println("taskId:"+taskId);
+		return "Received GET data: " + data;
+	}
+
+
+}

ruoyi-admin/src/main/resources/application.yml

@@ -323,3 +323,12 @@ management:
   endpoint:
     logfile:
       external-file: ./logs/sys-console.log
+
+
+aes:
+  enabled: false
+  secret-key: gwk0ghayjw7vnmru
+  exclude-paths:
+    - /ruoyi/actuator/**
+    - /ruoyi/system/**
+    - /ruoyi/admin/**