wuye / MicroCommunit

Commit 0675583f02d569889c8bd8b1bccc6010a7753e1b

Authored by 王彪总
1 parent 1e7012de

fix(config): 更新配置文件和修复分页计算问题 

- 在.gitignore中添加.mcp.json文件忽略
- 更新application-dev.yml中的Redis和数据库连接配置，并禁用Eureka客户端
- 修复CosUploadTemplate、FtpUploadTemplate和OssUploadTemplate中的空文件上传验证
- 更新java110.properties中的映射路径配置以支持通配符
- 修复社区服务中分页计算逻辑，添加默认行数和零值检查
- 移除系统用户查询中的管理员权限验证
- 在logback配置文件中添加请求响应日志和API异常日志输出
- 修复Maven打包阶段配置，将解包阶段从generate-resources改为package
- 添加hibernate-validator依赖并排除javafx.base冲突
- 扩展文件上传组件以支持multipart文件上传和IP地址获取功能
Inline Side-by-side
Showing 3 changed files with 6 additions and 2 deletions
java110-bean/src/main/java/com/java110/po/property/AttendanceRecordPo.java
  View file @0675583
... ... @@ -20,6 +20,7 @@ public class AttendanceRecordPo implements Serializable {
20 20 private BigDecimal longitude;
21 21 private BigDecimal latitude;
22 22 private String storeId;
  23 + private String photoUrl; // 打卡照片URL
23 24 private Date createTime;
24 25  
25 26 public String getId() { return id; }
... ... @@ -42,6 +43,8 @@ public class AttendanceRecordPo implements Serializable {
42 43 public void setLatitude(BigDecimal latitude) { this.latitude = latitude; }
43 44 public String getStoreId() { return storeId; }
44 45 public void setStoreId(String storeId) { this.storeId = storeId; }
  46 + public String getPhotoUrl() { return photoUrl; }
  47 + public void setPhotoUrl(String photoUrl) { this.photoUrl = photoUrl; }
45 48 public Date getCreateTime() { return createTime; }
46 49 public void setCreateTime(Date createTime) { this.createTime = createTime; }
47 50 }
... ...
service-user/src/main/java/com/java110/user/cmd/property/AttendancePunchCmd.java
  View file @0675583
... ... @@ -103,6 +103,7 @@ public class AttendancePunchCmd extends Cmd {
103 103 po.setPunchAddress(reqJson.containsKey("punchAddress") ? reqJson.getString("punchAddress") : "");
104 104 po.setLongitude(reqJson.getBigDecimal("longitude"));
105 105 po.setLatitude(reqJson.getBigDecimal("latitude"));
  106 + po.setPhotoUrl(reqJson.containsKey("photoUrl") ? reqJson.getString("photoUrl") : "");
106 107  
107 108 attendanceRecordV1ServiceDao.saveAttendanceRecord(po);
108 109 context.setResponseEntity(ResultVo.success());
... ...
service-user/src/main/resources/mapper/property/AttendanceRecordMapper.xml
  View file @0675583
... ... @@ -3,8 +3,8 @@
3 3 <mapper namespace="AttendanceRecordV1ServiceDaoImpl">
4 4  
5 5 <insert id="saveAttendanceRecord" parameterType="com.java110.po.property.AttendanceRecordPo">
6   - INSERT INTO attendance_record(id, user_id, user_name, work_type, punch_type, punch_time, punch_address, longitude, latitude, store_id, create_time)
7   - VALUES(#{id}, #{userId}, #{userName}, #{workType}, #{punchType}, #{punchTime}, #{punchAddress}, #{longitude}, #{latitude}, #{storeId}, NOW())
  6 + INSERT INTO attendance_record(id, user_id, user_name, work_type, punch_type, punch_time, punch_address, longitude, latitude, store_id, photo_url, create_time)
  7 + VALUES(#{id}, #{userId}, #{userName}, #{workType}, #{punchType}, #{punchTime}, #{punchAddress}, #{longitude}, #{latitude}, #{storeId}, #{photoUrl}, NOW())
8 8 </insert>
9 9  
10 10 <select id="queryAttendanceRecords" parameterType="map" resultType="map">
... ...