xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

车辆限重记录日志表主键改为uuid

dev
wuwenxiong 2021-09-14 11:19:57 +08:00
parent 6f99414aa3
commit d1fcd5564f
5 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTruckWeightLimitModifyLog.java
View File

@ -21,25 +21,26 @@ public abstract class BaseTruckWeightLimitModifyLog<M extends BaseTruckWeightLim
} }
/** /**
* name: id * name: uuid
* type: INT UNSIGNED(10) * type: CHAR(32)
* isNullable: NO * isNullable: NO
* isPrimaryKey: YES * isPrimaryKey: NO
* defaultValue: * defaultValue:
* @param id 主键 *
* @param uuid UUID 唯一验证
*/ */
@JSONField(name="id") @JSONField(name = "uuid")
public void setId(Long id) { public void setUuid(String uuid) {
set("id", id); set("uuid", uuid);
} }
/** /**
* @return id 主键 * @return uuid UUID 唯一验证
*/ */
@JSONField(name="id") @JSONField(name = "uuid")
public Long getId() { public String getUuid() {
return getLong("id"); return getStr("uuid");
} }
/** /**

4
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogPKValidator.java
View File

@ -15,8 +15,8 @@ import com.jfinal.core.Controller;
public class TruckWeightLimitModifyLogPKValidator extends CrudParamValidator { public class TruckWeightLimitModifyLogPKValidator extends CrudParamValidator {
@Override @Override
protected void validate(Controller c) { protected void validate(Controller c) {
validateRequired("id", "id", "id 必填"); validateRequired("uuid", "uuid", "uuid 必填");
validateLong("id", 1, 2147483647, "id", "id 范围 1~2147483647"); validateString("uuid", 32, 32, "uuid", "uuid 长度 32，必填");
} }
protected void handleError(Controller c) { protected void handleError(Controller c) {

5
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogValidator.java
View File

@ -17,9 +17,8 @@ public class TruckWeightLimitModifyLogValidator extends CrudParamValidator {
protected void validate(Controller c) { protected void validate(Controller c) {
// 默认新增时，前端不需要传主键。若需要前端传主键，需要去掉这个判断 // 默认新增时，前端不需要传主键。若需要前端传主键，需要去掉这个判断
if (!"save".equals(getActionMethodName())) { if (!"save".equals(getActionMethodName())) {
validateRequired("id", "id", "id 必填"); validateRequired("uuid", "uuid", "uuid 必填");
validateString("uuid", 32, 32, "uuid", "uuid 长度 32，必填");
validateLong("id", 1, 2147483647, "id", "id 范围 1~2147483647");
} }
validateString("truck_license", 1, 10, "truck_license", "truck_license 长度 1~10"); validateString("truck_license", 1, 10, "truck_license", "truck_license 长度 1~10");

6
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitSyncService.java
View File

@ -49,6 +49,7 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
@Override @Override
public boolean run() { public boolean run() {
TruckWeightLimitModifyLog modifyLog = new TruckWeightLimitModifyLog(); TruckWeightLimitModifyLog modifyLog = new TruckWeightLimitModifyLog();
modifyLog.setUuid(StrKit.getRandomUUID());
modifyLog.setTruckLicense(model.getTruckLicense()); modifyLog.setTruckLicense(model.getTruckLicense());
modifyLog.setWeightLimit(model.getWeightLimit()); modifyLog.setWeightLimit(model.getWeightLimit());
modifyLog.setAttachment(model.getAttachment()); modifyLog.setAttachment(model.getAttachment());
@ -63,7 +64,7 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
return false; return false;
} }
synctask.addSaveData(model); // 有自增长主键的，在保存 model 后会自动填充主键的值，然后才能加到 synctask 里面 synctask.addSaveData(model);
synctask.addSaveData(modifyLog); synctask.addSaveData(modifyLog);
return SyncTaskService.me.save(synctask) return SyncTaskService.me.save(synctask)
@ -106,6 +107,7 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
@Override @Override
public boolean run() { public boolean run() {
TruckWeightLimitModifyLog modifyLog = new TruckWeightLimitModifyLog(); TruckWeightLimitModifyLog modifyLog = new TruckWeightLimitModifyLog();
modifyLog.setUuid(StrKit.getRandomUUID());
modifyLog.setTruckLicense(model.getTruckLicense()); modifyLog.setTruckLicense(model.getTruckLicense());
modifyLog.setWeightLimit(model.getWeightLimit()); modifyLog.setWeightLimit(model.getWeightLimit());
modifyLog.setAttachment(model.getAttachment()); modifyLog.setAttachment(model.getAttachment());
@ -159,6 +161,7 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
public boolean run() { public boolean run() {
try { try {
TruckWeightLimitModifyLog modifyLog = new TruckWeightLimitModifyLog(); TruckWeightLimitModifyLog modifyLog = new TruckWeightLimitModifyLog();
modifyLog.setUuid(StrKit.getRandomUUID());
modifyLog.setTruckLicense(model.getTruckLicense()); modifyLog.setTruckLicense(model.getTruckLicense());
modifyLog.setWeightLimit(model.getWeightLimit()); modifyLog.setWeightLimit(model.getWeightLimit());
modifyLog.setAttachment(model.getAttachment()); modifyLog.setAttachment(model.getAttachment());
@ -213,6 +216,7 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
public boolean run() { public boolean run() {
try { try {
TruckWeightLimitModifyLog modifyLog = new TruckWeightLimitModifyLog(); TruckWeightLimitModifyLog modifyLog = new TruckWeightLimitModifyLog();
modifyLog.setUuid(StrKit.getRandomUUID());
modifyLog.setTruckLicense(model.getTruckLicense()); modifyLog.setTruckLicense(model.getTruckLicense());
modifyLog.setWeightLimit(model.getWeightLimit()); modifyLog.setWeightLimit(model.getWeightLimit());
modifyLog.setAttachment(model.getAttachment()); modifyLog.setAttachment(model.getAttachment());

18
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/synctask/SyncTaskService.java
View File

@ -281,10 +281,10 @@ public class SyncTaskService {
JSONArray arr = data.getJSONArray("data"); JSONArray arr = data.getJSONArray("data");
List<Record> list = new ArrayList<>(); List<Record> list = new ArrayList<>();
if (AuthLicense.dao.getTablename().equals(tablename)) { // if (AuthLicense.dao.getTablename().equals(tablename)) {
saveauthlics.addAll(arr); // saveauthlics.addAll(arr);
continue; // continue;
} // }
SyncTask synctask = new SyncTask(); SyncTask synctask = new SyncTask();
synctask.setCreateTime(now); synctask.setCreateTime(now);
@ -301,7 +301,10 @@ public class SyncTaskService {
} }
// 分发黑名单 // 分发黑名单
if (Blacklist.dao.getTablename().equals(tablename)) { if (Blacklist.dao.getTablename().equals(tablename)
|| "truck_weight_limit".equals(tablename)
|| "truck_weight_limit_modify_log".equals(tablename)
) {
for (Map.Entry<Integer, Supermarket> entry : SvrCacheData.SUP_CACHE.entrySet()) { for (Map.Entry<Integer, Supermarket> entry : SvrCacheData.SUP_CACHE.entrySet()) {
Supermarket supermarket = entry.getValue(); Supermarket supermarket = entry.getValue();
@ -366,7 +369,10 @@ public class SyncTaskService {
} }
// 分发黑名单 // 分发黑名单
if (Blacklist.dao.getTablename().equals(tablename)) { if (Blacklist.dao.getTablename().equals(tablename)
|| "truck_weight_limit".equals(tablename)
|| "truck_weight_limit_modify_log".equals(tablename)
) {
for (Map.Entry<Integer, Supermarket> entry : SvrCacheData.SUP_CACHE.entrySet()) { for (Map.Entry<Integer, Supermarket> entry : SvrCacheData.SUP_CACHE.entrySet()) {
Supermarket supermarket = entry.getValue(); Supermarket supermarket = entry.getValue();