From f856607eaa78a441eeac934719014bddb84f006e Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Wed, 12 Aug 2020 14:37:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=94=A8=E6=88=B7=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cowr/common/base/BaseService.java | 62 ++-- .../main/java/com/cowr/model/_MappingKit.java | 6 +- ssjygl-xsx-local/build.sh | 2 +- ssjygl-xsx-local/debug.sh | 2 +- .../authlicense/AuthLicenseController.java | 8 +- .../ssjygl/blacklist/BlacklistController.java | 6 +- .../local/ssjygl/main/AuthInterceptor.java | 4 +- .../com/cowr/local/ssjygl/main/Config.java | 28 +- .../cowr/local/ssjygl/netty/NettyClient.java | 4 +- .../OrderPurchaseController.java | 8 +- .../OrderPurchaseSyncService.java | 4 +- .../order/ordersale/OrderSaleController.java | 10 +- .../order/ordersale/OrderSaleSyncService.java | 4 +- .../order/ordertemp/OrderTempController.java | 12 +- .../order/ordertemp/OrderTempSyncService.java | 4 +- .../OrderTransferController.java | 8 +- .../OrderTransferSyncService.java | 4 +- .../ordertrash/OrderTrashController.java | 8 +- .../ordertrash/OrderTrashSyncService.java | 4 +- .../prepaytruck/PrepayTruckController.java | 10 +- .../supermarket/stock/StockController.java | 4 +- .../ssjygl/synctask/SyncTaskService.java | 8 +- .../system/sysuser/SysuserController.java | 65 +--- ...erService.java => SysuserSyncService.java} | 320 ++++-------------- .../ssjygl/transport/TransportController.java | 24 +- .../transport/TransportSyncService.java | 7 +- .../src/main/resources/dev/config.properties | 8 +- .../src/main/resources/dev/db.properties | 17 +- .../src/main/resources/job.properties | 2 +- .../src/main/resources/prod/config.properties | 6 +- .../src/main/resources/prod/db.properties | 2 +- ssjygl-xsx-local/start.sh | 3 +- .../service/ssjygl/base/BaseSyncService.java | 10 +- .../ssjygl/blacklist/BlacklistController.java | 6 +- .../ssjygl/customer/CustomerController.java | 10 +- .../contact/CustomerContactController.java | 10 +- .../receiver/CustomerReceiverController.java | 10 +- .../ssjygl/driver/DriverController.java | 10 +- .../service/ssjygl/main/AuthInterceptor.java | 4 +- .../ordercluster/OrderclusterController.java | 10 +- .../prepaydetail/PrepayDetailController.java | 12 +- .../prepaydetail/PrepayDetailSyncService.java | 4 +- .../refunddetail/RefundDetailController.java | 14 +- .../refunddetail/RefundDetailSyncService.java | 6 +- .../ssjygl/product/ProductController.java | 10 +- .../ssjygl/purchase/PurchaseController.java | 10 +- .../ssjygl/sandfarm/SandfarmController.java | 10 +- .../supermarket/SupermarketController.java | 8 +- ...SupermarketReceiverDistanceController.java | 12 +- ...SupermarketSandfarmDistanceController.java | 10 +- .../ssjygl/synctask/SyncTaskService.java | 29 +- .../system/sysuser/SysuserController.java | 52 ++- ...erService.java => SysuserSyncService.java} | 160 ++++++--- .../TransportCompanyController.java | 10 +- .../service/ssjygl/truck/TruckController.java | 10 +- .../src/main/resources/dev/config.properties | 6 +- .../src/main/resources/dev/db.properties | 2 +- .../src/main/resources/job.properties | 2 +- .../src/main/resources/prod/config.properties | 6 +- .../src/main/resources/prod/db.properties | 2 +- ssjygl-xsx-service/start.sh | 3 +- 61 files changed, 501 insertions(+), 611 deletions(-) rename ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/{SysuserService.java => SysuserSyncService.java} (59%) rename ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/{SysuserService.java => SysuserSyncService.java} (77%) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/base/BaseService.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/base/BaseService.java index 8815295..8a6daf4 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/base/BaseService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/base/BaseService.java @@ -154,16 +154,16 @@ public class BaseService { */ public Result delete(BaseModel model, Sysuser sysuser) { try { - // 如果存在逻辑删除字段 del，则只做逻辑删除，不做物理删除 - if (model.hasDelKey()) { - return logicDel(model, sysuser); - } - // 注意这里有 ！，找到后才做 delete 操作 if (!model.checkExistsByPk()) { return Result.failed(false, "按主键未找到对应记录"); } + // 如果存在逻辑删除字段 del，则只做逻辑删除，不做物理删除 + if (model.hasDelKey()) { + return logicDel(model, sysuser); + } + boolean ret = Db.tx(new IAtom() { @Override public boolean run() { @@ -201,9 +201,11 @@ public class BaseService { return Result.failed(false, "不存在逻辑删除字段"); } - model.set(Const.LOGIC_DEL_KEY, Const.LOGIC_DEL_INVALID); // 逻辑删除字段统一用 del + BaseModel old = (BaseModel) model.findByPk(); // 找到旧记录进行更新 - return update(model); + old.set(Const.LOGIC_DEL_KEY, Const.LOGIC_DEL_INVALID); // 逻辑删除字段统一用 del + + return update(old); } catch (Exception e) { log.error(e.getMessage(), e); return Result.failed(false, "删除失败"); @@ -222,9 +224,11 @@ public class BaseService { return Result.failed(false, "不存在逻辑删除字段"); } - model.set(Const.LOGIC_DEL_KEY, Const.LOGIC_DEL_INVALID); // 逻辑删除字段统一用 del + BaseModel old = (BaseModel) model.findByPk(); // 找到旧记录进行更新 - return update(model, sysuser); + old.set(Const.LOGIC_DEL_KEY, Const.LOGIC_DEL_INVALID); // 逻辑删除字段统一用 del + + return update(old, sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return Result.failed(false, "删除失败"); @@ -243,9 +247,11 @@ public class BaseService { return Result.failed(false, "不存在逻辑删除字段"); } - model.set(Const.LOGIC_DEL_KEY, Const.LOGIC_DEL_VALID); // 逻辑删除字段统一用 del + BaseModel old = (BaseModel) model.findByPk(); // 找到旧记录进行更新 - return update(model); + old.set(Const.LOGIC_DEL_KEY, Const.LOGIC_DEL_VALID); // 逻辑删除字段统一用 del + + return update(old); } catch (Exception e) { log.error(e.getMessage(), e); return Result.failed(false, "恢复失败"); @@ -264,9 +270,11 @@ public class BaseService { return Result.failed(false, "不存在逻辑删除字段"); } - model.set(Const.LOGIC_DEL_KEY, Const.LOGIC_DEL_VALID); // 逻辑删除字段统一用 del + BaseModel old = (BaseModel) model.findByPk(); // 找到旧记录进行更新 - return update(model, sysuser); + old.set(Const.LOGIC_DEL_KEY, Const.LOGIC_DEL_VALID); // 逻辑删除字段统一用 del + + return update(old, sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return Result.failed(false, "恢复失败"); @@ -288,14 +296,16 @@ public class BaseService { return Result.failed(false, "按主键未找到对应记录"); } - boolean ret = model.update(); - - // 将修改后的对象返回 - String[] keys = model._getAttrNames(); - for (String key : keys) { - oldobj.set(key, model.get(key)); + // 将新对象中，不为 null 的字段设置到旧的对象中，然后用旧对象更新数据 + // TODO: 如果要在更新时，将某一个字段置为 null 则需要重新该方法，并且前端提交数据时也要配合 + for(String key : model._getAttrNames()){ + if(model.get(key) != null){ + oldobj.set(key, model.get(key)); + } } + boolean ret = oldobj.update(); + return ret ? Result.object(oldobj) : Result.failed(false, "修改失败"); } catch (Exception e) { log.error(e.getMessage(), e); @@ -318,14 +328,24 @@ public class BaseService { return Result.failed(false, "按主键未找到对应记录"); } + BaseModel old = (BaseModel) oldobj.clone(); + + // 将新对象中，不为 null 的字段设置到旧的对象中，然后用旧对象更新数据 + // TODO: 如果要在更新时，将某一个字段置为 null 则需要重新该方法，并且前端提交数据时也要配合 + for(String key : model._getAttrNames()){ + if(model.get(key) != null){ + oldobj.set(key, model.get(key)); + } + } + boolean ret = Db.tx(new IAtom() { @Override public boolean run() { try{ - boolean ret = model.update(); + boolean ret = oldobj.update(); if (ret) { - ret = ModifyLogService.me.save(model, oldobj, Enums.DataOpType.UPDATE.getId(), sysuser); + ret = ModifyLogService.me.save(oldobj, old, Enums.DataOpType.UPDATE.getId(), sysuser); } return ret; diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/_MappingKit.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/_MappingKit.java index 67d1b8c..d29dfad 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/_MappingKit.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/_MappingKit.java @@ -17,9 +17,9 @@ public class _MappingKit { public static void mapping(ActiveRecordPlugin arp) { arp.addMapping("auth_license", "truck_license", AuthLicense.class); - arp.addMapping("bocomm", "id", Bocomm.class); - arp.addMapping("bocomm_request", "id", BocommRequest.class); - arp.addMapping("bocomm_response", "id", BocommResponse.class); +// arp.addMapping("bocomm", "id", Bocomm.class); +// arp.addMapping("bocomm_request", "id", BocommRequest.class); +// arp.addMapping("bocomm_response", "id", BocommResponse.class); arp.addMapping("transport", "id", Transport.class); arp.addMapping("device_config", "supermarket_id", DeviceConfig.class); arp.addMapping("driver", "id", Driver.class); diff --git a/ssjygl-xsx-local/build.sh b/ssjygl-xsx-local/build.sh index c60568a..3e5faab 100644 --- a/ssjygl-xsx-local/build.sh +++ b/ssjygl-xsx-local/build.sh @@ -2,7 +2,7 @@ git pull mvn clean package -./target/ssjygl-local-release/ssjygl-local/start.sh +./target/ssjygl-xsx-local-release/ssjygl-local/start.sh diff --git a/ssjygl-xsx-local/debug.sh b/ssjygl-xsx-local/debug.sh index 63546a5..f7054ac 100644 --- a/ssjygl-xsx-local/debug.sh +++ b/ssjygl-xsx-local/debug.sh @@ -1,6 +1,6 @@ #!/bin/bash -./target/ssjygl-local-release/ssjygl-local/start.sh +./target/ssjygl-xsx-local-release/ssjygl-local/start.sh diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/authlicense/AuthLicenseController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/authlicense/AuthLicenseController.java index 2d63306..209226e 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/authlicense/AuthLicenseController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/authlicense/AuthLicenseController.java @@ -3,7 +3,7 @@ package com.cowr.local.ssjygl.authlicense; import com.cowr.common.base.BaseController; import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; -import com.cowr.local.ssjygl.system.sysuser.SysuserService; +import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.model.AuthLicense; import com.cowr.model.Sysuser; import com.cowr.ssjygl.authlicense.AuthLicensePKValidator; @@ -24,7 +24,7 @@ public class AuthLicenseController extends BaseController { */ @Before(AuthLicenseValidator.class) public void save() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -40,7 +40,7 @@ public class AuthLicenseController extends BaseController { */ @Before(AuthLicensePKValidator.class) public void del() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -63,7 +63,7 @@ public class AuthLicenseController extends BaseController { } public void batchDel(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/blacklist/BlacklistController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/blacklist/BlacklistController.java index 01ddb1f..945a2a0 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/blacklist/BlacklistController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/blacklist/BlacklistController.java @@ -3,7 +3,7 @@ package com.cowr.local.ssjygl.blacklist; import com.cowr.common.base.BaseController; import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; -import com.cowr.local.ssjygl.system.sysuser.SysuserService; +import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.model.Blacklist; import com.cowr.model.Sysuser; import com.cowr.ssjygl.blacklist.BlacklistPKValidator; @@ -36,7 +36,7 @@ public class BlacklistController extends BaseController { */ @Before(BlacklistValidator.class) public void save(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -84,7 +84,7 @@ public class BlacklistController extends BaseController { @Before(BlacklistPKValidator.class) public void remove(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/AuthInterceptor.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/AuthInterceptor.java index 778bf1b..002d91e 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/AuthInterceptor.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/AuthInterceptor.java @@ -1,7 +1,7 @@ package com.cowr.local.ssjygl.main; import com.cowr.common.view.Result; -import com.cowr.local.ssjygl.system.sysuser.SysuserService; +import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.model.Sysuser; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; @@ -39,7 +39,7 @@ public class AuthInterceptor implements Interceptor { return; } - Sysuser sysuser = SysuserService.me.getSysuserByToken(token); + Sysuser sysuser = SysuserSyncService.me.getSysuserByToken(token); if (sysuser == null) { c.renderJson(Result.noauth()); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java index 0523327..c096084 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java @@ -238,26 +238,14 @@ public class Config extends JFinalConfig { } me.add(new QuartzPlugin()); - - if (isprod) { - RedisPlugin redis = new RedisPlugin( - com.cowr.common.Const.REDIS_CACHENAME, - dbprop.get("redis.ip"), - dbprop.getInt("redis.port"), - 0 - ); - - me.add(redis); - } else { - me.add(new RedisPlugin( - com.cowr.common.Const.REDIS_CACHENAME, - dbprop.get("redis.ip"), - dbprop.getInt("redis.port"), - 0, - dbprop.get("redis.pwd"), - dbprop.getInt("redis.db") - )); - } + me.add(new RedisPlugin( + com.cowr.common.Const.REDIS_CACHENAME, + dbprop.get("redis.ip"), + dbprop.getInt("redis.port"), + 0 +// , dbprop.get("redis.pwd") +// , dbprop.getInt("redis.db") + )); } @Override diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/netty/NettyClient.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/netty/NettyClient.java index f87110d..3219023 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/netty/NettyClient.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/netty/NettyClient.java @@ -103,7 +103,9 @@ public class NettyClient { log.debug("停止 socket 服务"); try { if (channel != null) { - channel.parent().close(); + if(channel.parent() != null){ + channel.parent().close(); + } channel.close(); } diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseController.java index 59f6bd9..82dbd8b 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseController.java @@ -6,7 +6,7 @@ import com.cowr.common.enums.OrderTypeEnum; import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.local.ssjygl.order.OrderService; -import com.cowr.local.ssjygl.system.sysuser.SysuserService; +import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.model.Sysuser; import com.cowr.ssjygl.order.OrderCancelValidator; import com.cowr.ssjygl.order.SnValidator; @@ -42,7 +42,7 @@ public class OrderPurchaseController extends BaseController { @Before(OrderPurchasePayValidator.class) public void pay() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -64,7 +64,7 @@ public class OrderPurchaseController extends BaseController { */ @Before(OrderCancelValidator.class) public void cancel() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -79,7 +79,7 @@ public class OrderPurchaseController extends BaseController { @Before(SnValidator.class) public void print() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseSyncService.java index 46831e2..ad45cee 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseSyncService.java @@ -7,7 +7,7 @@ import com.cowr.common.view.Result; import com.cowr.local.ssjygl.order.OrderService; import com.cowr.local.ssjygl.order.orderseq.OrderSeqService; import com.cowr.local.ssjygl.synctask.SyncTaskService; -import com.cowr.local.ssjygl.system.sysuser.SysuserService; +import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.model.*; import com.cowr.ssjygl.modifylog.ModifyLogService; import com.cowr.ssjygl.supermarket.sandfarmdistance.SupermarketSandfarmDistanceService; @@ -192,7 +192,7 @@ public class OrderPurchaseSyncService { // 订单已经完成 if (orderstate == OrderStateEnum.RECEIVED.getStateid()) { // 已完成订单，再删除时需要重新验证密码 - Sysuser chkuser = SysuserService.me.getUserByWhere(null, sysuser.getPhone(), password); + Sysuser chkuser = SysuserSyncService.me.getUserByWhere(null, sysuser.getPhone(), password); if (chkuser == null) { log.debug("用户输入密码错误"); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleController.java index 1c721ec..8ffad40 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleController.java @@ -6,7 +6,7 @@ import com.cowr.common.enums.OrderTypeEnum; import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.local.ssjygl.order.OrderService; -import com.cowr.local.ssjygl.system.sysuser.SysuserService; +import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.model.Sysuser; import com.cowr.ssjygl.order.OrderCancelValidator; import com.cowr.ssjygl.order.SnValidator; @@ -45,7 +45,7 @@ public class OrderSaleController extends BaseController { */ @Before(OrderSalePayValidator.class) public void pay() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -67,7 +67,7 @@ public class OrderSaleController extends BaseController { */ @Before(OrderSalePayValidator.class) public void prepay() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -90,7 +90,7 @@ public class OrderSaleController extends BaseController { */ @Before(OrderCancelValidator.class) public void cancel() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -105,7 +105,7 @@ public class OrderSaleController extends BaseController { @Before(SnValidator.class) public void print() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleSyncService.java index a6de942..22a8d9d 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleSyncService.java @@ -9,7 +9,7 @@ import com.cowr.local.ssjygl.order.OrderService; import com.cowr.local.ssjygl.order.orderseq.OrderSeqService; import com.cowr.local.ssjygl.supermarket.product.SupermarketProductService; import com.cowr.local.ssjygl.synctask.SyncTaskService; -import com.cowr.local.ssjygl.system.sysuser.SysuserService; +import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.model.*; import com.cowr.ssjygl.modifylog.ModifyLogService; import com.cowr.ssjygl.prepay.prepaycustomer.PrepayCustomerService; @@ -535,7 +535,7 @@ public class OrderSaleSyncService { // 订单已经完成 if (orderstate == OrderStateEnum.RECEIVED.getStateid()) { // 已完成订单，再删除时需要重新验证密码 - Sysuser chkuser = SysuserService.me.getUserByWhere(null, sysuser.getPhone(), password); + Sysuser chkuser = SysuserSyncService.me.getUserByWhere(null, sysuser.getPhone(), password); if (chkuser == null) { log.debug("用户输入密码错误"); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempController.java index e233362..f778a63 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempController.java @@ -6,7 +6,7 @@ import com.cowr.common.enums.OrderTypeEnum; import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.local.ssjygl.order.OrderService; -import com.cowr.local.ssjygl.system.sysuser.SysuserService; +import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.model.Sysuser; import com.cowr.ssjygl.order.OrderCancelValidator; import com.cowr.ssjygl.order.SnValidator; @@ -43,7 +43,7 @@ public class OrderTempController extends BaseController { @Before(OrderTempPayValidator.class) public void pay() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -63,7 +63,7 @@ public class OrderTempController extends BaseController { @Before(OrderTempPayValidator.class) public void payordercluster() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -80,7 +80,7 @@ public class OrderTempController extends BaseController { @Before(OrderTempPrepayValidator.class) public void prepay() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -101,7 +101,7 @@ public class OrderTempController extends BaseController { */ @Before(OrderCancelValidator.class) public void cancel() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -116,7 +116,7 @@ public class OrderTempController extends BaseController { @Before(SnValidator.class) public void print() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java index 8e919f3..b0adba9 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java @@ -9,7 +9,7 @@ import com.cowr.local.ssjygl.order.OrderService; import com.cowr.local.ssjygl.order.orderseq.OrderSeqService; import com.cowr.local.ssjygl.supermarket.product.SupermarketProductService; import com.cowr.local.ssjygl.synctask.SyncTaskService; -import com.cowr.local.ssjygl.system.sysuser.SysuserService; +import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.model.*; import com.cowr.ssjygl.modifylog.ModifyLogService; import com.cowr.ssjygl.prepay.prepaycustomer.PrepayCustomerService; @@ -627,7 +627,7 @@ public class OrderTempSyncService { // 订单已经完成 if (orderstate == OrderStateEnum.RECEIVED.getStateid()) { // 已完成订单，再删除时需要重新验证密码 - Sysuser chkuser = SysuserService.me.getUserByWhere(null, sysuser.getPhone(), password); + Sysuser chkuser = SysuserSyncService.me.getUserByWhere(null, sysuser.getPhone(), password); if (chkuser == null) { log.debug("用户输入密码错误"); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferController.java index 3133eaa..9e9c71e 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferController.java @@ -6,7 +6,7 @@ import com.cowr.common.enums.OrderTypeEnum; import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.local.ssjygl.order.OrderService; -import com.cowr.local.ssjygl.system.sysuser.SysuserService; +import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.model.Sysuser; import com.cowr.ssjygl.order.OrderCancelValidator; import com.cowr.ssjygl.order.SnValidator; @@ -42,7 +42,7 @@ public class OrderTransferController extends BaseController { @Before(OrderTransferPayValidator.class) public void pay() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -64,7 +64,7 @@ public class OrderTransferController extends BaseController { */ @Before(OrderCancelValidator.class) public void cancel() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -79,7 +79,7 @@ public class OrderTransferController extends BaseController { @Before(SnValidator.class) public void print() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferSyncService.java index 69ac8ee..44b306b 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferSyncService.java @@ -7,7 +7,7 @@ import com.cowr.common.view.Result; import com.cowr.local.ssjygl.order.OrderService; import com.cowr.local.ssjygl.order.orderseq.OrderSeqService; import com.cowr.local.ssjygl.synctask.SyncTaskService; -import com.cowr.local.ssjygl.system.sysuser.SysuserService; +import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.model.*; import com.cowr.ssjygl.modifylog.ModifyLogService; import com.cowr.ssjygl.supermarket.sandfarmdistance.SupermarketSandfarmDistanceService; @@ -205,7 +205,7 @@ public class OrderTransferSyncService { // 订单已经完成 if (orderstate == OrderStateEnum.RECEIVED.getStateid()) { // 已完成订单，再删除时需要重新验证密码 - Sysuser chkuser = SysuserService.me.getUserByWhere(null, sysuser.getPhone(), password); + Sysuser chkuser = SysuserSyncService.me.getUserByWhere(null, sysuser.getPhone(), password); if (chkuser == null) { log.debug("用户输入密码错误"); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashController.java index bfbeaec..63c0628 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashController.java @@ -6,7 +6,7 @@ import com.cowr.common.enums.OrderTypeEnum; import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.local.ssjygl.order.OrderService; -import com.cowr.local.ssjygl.system.sysuser.SysuserService; +import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.model.Sysuser; import com.cowr.ssjygl.order.OrderCancelValidator; import com.cowr.ssjygl.order.SnValidator; @@ -41,7 +41,7 @@ public class OrderTrashController extends BaseController { @Before(OrderTrashPayValidator.class) public void pay() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -62,7 +62,7 @@ public class OrderTrashController extends BaseController { */ @Before(OrderCancelValidator.class) public void cancel() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -77,7 +77,7 @@ public class OrderTrashController extends BaseController { @Before(SnValidator.class) public void print() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashSyncService.java index a3e6d6c..4a93b31 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashSyncService.java @@ -7,7 +7,7 @@ import com.cowr.common.view.Result; import com.cowr.local.ssjygl.order.OrderService; import com.cowr.local.ssjygl.order.orderseq.OrderSeqService; import com.cowr.local.ssjygl.synctask.SyncTaskService; -import com.cowr.local.ssjygl.system.sysuser.SysuserService; +import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.model.*; import com.cowr.ssjygl.modifylog.ModifyLogService; import com.cowr.ssjygl.transprice.TransPriceService; @@ -181,7 +181,7 @@ public class OrderTrashSyncService { // 订单已经完成 if (orderstate == OrderStateEnum.RECEIVED.getStateid()) { // 已完成订单，再删除时需要重新验证密码 - Sysuser chkuser = SysuserService.me.getUserByWhere(null, sysuser.getPhone(), password); + Sysuser chkuser = SysuserSyncService.me.getUserByWhere(null, sysuser.getPhone(), password); if (chkuser == null) { log.debug("用户输入密码错误"); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/prepay/prepaytruck/PrepayTruckController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/prepay/prepaytruck/PrepayTruckController.java index 13c8365..71a9d92 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/prepay/prepaytruck/PrepayTruckController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/prepay/prepaytruck/PrepayTruckController.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONArray; import com.cowr.common.base.BaseController; import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; -import com.cowr.local.ssjygl.system.sysuser.SysuserService; +import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.model.PrepayTruck; import com.cowr.model.Sysuser; import com.cowr.ssjygl.prepay.prepaytruck.PrepayTruckPKValidator; @@ -39,7 +39,7 @@ public class PrepayTruckController extends BaseController { */ @Before(PrepayTruckValidator.class) public void save() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -67,7 +67,7 @@ public class PrepayTruckController extends BaseController { */ @Before(PrepayTruckPKValidator.class) public void del() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -83,7 +83,7 @@ public class PrepayTruckController extends BaseController { */ @Before(PrepayTruckPKValidator.class) public void restore() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -99,7 +99,7 @@ public class PrepayTruckController extends BaseController { */ @Before(PrepayTruckValidator.class) public void edit() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/stock/StockController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/stock/StockController.java index 7740694..9c5492b 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/stock/StockController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/stock/StockController.java @@ -2,7 +2,7 @@ package com.cowr.local.ssjygl.supermarket.stock; import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; -import com.cowr.local.ssjygl.system.sysuser.SysuserService; +import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.model.Stock; import com.cowr.model.Sysuser; import com.cowr.ssjygl.supermarket.stock.StockService; @@ -23,7 +23,7 @@ public class StockController extends Controller { */ @Before(StockValidator.class) public void edit(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/synctask/SyncTaskService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/synctask/SyncTaskService.java index a32af30..bdfdc6c 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/synctask/SyncTaskService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/synctask/SyncTaskService.java @@ -43,7 +43,13 @@ public class SyncTaskService { synctask.setSupermarketId(CliCacheData.SUP.getId()); synctask.setCreateTime(new Date()); - return synctask.save(); // 有插入的，还是需要返回插入状态 + boolean ret = synctask.save(); + + if(ret){ + send(synctask); + } + + return ret; // 有插入的，还是需要返回插入状态 } /** diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserController.java index 148ffb0..b34a88a 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserController.java @@ -7,7 +7,6 @@ import com.cowr.common.view.Result; import com.cowr.local.ssjygl.main.AuthInterceptor; import com.cowr.model.Sysuser; import com.cowr.ssjygl.system.sysuser.SysuserPKValidator; -import com.cowr.ssjygl.system.sysuser.SysuserValidator; import com.jfinal.aop.Before; import com.jfinal.aop.Clear; import com.jfinal.core.Controller; @@ -29,43 +28,7 @@ public class SysuserController extends Controller { @Before(SysuserPKValidator.class) public void checkExistsByPk(){ Sysuser model = getModel(Sysuser.class, "", true); // 忽略不在model中的字段 - renderJson(SysuserService.me.checkExistsByPk(model)); - } - - /** - * 新增 sysuser - */ - @Before(SysuserValidator.class) - public void save(){ - Sysuser model = getModel(Sysuser.class, "", true); // 忽略不在model中的字段 - renderJson(SysuserService.me.save(model)); - } - - /** - * 删除 sysuser - */ - @Before(SysuserPKValidator.class) - public void del(){ - Sysuser model = getModel(Sysuser.class, "", true); // 忽略不在model中的字段 - renderJson(SysuserService.me.delete(model)); - } - - /** - * 恢复 sysuser - */ - @Before(SysuserPKValidator.class) - public void restore(){ - Sysuser model = getModel(Sysuser.class, "", true); // 忽略不在model中的字段 - renderJson(SysuserService.me.restore(model)); - } - - /** - * 修改 sysuser - */ - @Before(SysuserValidator.class) - public void edit(){ - Sysuser model = getModel(Sysuser.class, "", true); // 忽略不在model中的字段 - renderJson(SysuserService.me.update(model)); + renderJson(SysuserSyncService.me.checkExistsByPk(model)); } /** @@ -78,7 +41,7 @@ public class SysuserController extends Controller { Integer del = getInt("del", Const.LOGIC_DEL_VALID); // 默认显示未删除的 Integer type = getInt("type"); Integer entity_id = getInt("entity_id"); - renderJson(Result.object(SysuserService.me.find(pp, name, phone, del, type, entity_id))); + renderJson(Result.object(SysuserSyncService.me.find(pp, name, phone, del, type, entity_id))); } /** @@ -87,7 +50,7 @@ public class SysuserController extends Controller { @Before(SysuserPKValidator.class) public void findByPk(){ Sysuser model = getModel(Sysuser.class, "", true); // 忽略不在model中的字段 - renderJson(SysuserService.me.findByPk(model)); + renderJson(SysuserSyncService.me.findByPk(model)); } @Clear(AuthInterceptor.class) @@ -96,7 +59,7 @@ public class SysuserController extends Controller { String phone = get("phone", "").trim(); String password = get("password", ""); - renderJson(SysuserService.me.login(name, phone, password)); + renderJson(SysuserSyncService.me.login(name, phone, password)); } /** @@ -109,7 +72,7 @@ public class SysuserController extends Controller { if(!StrUtil.isPhone(phone)){ renderJson(Result.success(false)); }else{ - renderJson(Result.success(SysuserService.me.checkPhone(phone))); + renderJson(Result.success(SysuserSyncService.me.checkPhone(phone))); } } @@ -121,22 +84,6 @@ public class SysuserController extends Controller { String oldpwd = get("oldpwd", ""); String newpwd = get("newpwd", ""); - renderJson(SysuserService.me.updatePassword(token, oldpwd, newpwd)); - } - - /** - * 按主键查找单个对象 sysuser - */ - @Before(SysuserPKValidator.class) - public void resetpwd(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); - - if (tokenuser == null) { - renderJson(Result.noauth()); - return; - } - - Sysuser model = getModel(Sysuser.class, "", true); // 忽略不在model中的字段 - renderJson(SysuserService.me.resetPassword(model, tokenuser)); + renderJson(SysuserSyncService.me.updatePassword(token, oldpwd, newpwd)); } } diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java similarity index 59% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserService.java rename to ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java index 863fe45..db686c3 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java @@ -3,11 +3,14 @@ package com.cowr.local.ssjygl.system.sysuser; import com.cowr.common.Const; import com.cowr.common.base.BaseModel; import com.cowr.common.base.BaseService; +import com.cowr.common.enums.Enums; import com.cowr.common.enums.UserTypeEnum; import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.local.ssjygl.main.Config; +import com.cowr.local.ssjygl.synctask.SyncTaskService; import com.cowr.model.*; +import com.cowr.ssjygl.modifylog.ModifyLogService; import com.jfinal.kit.HashKit; import com.jfinal.kit.StrKit; import com.jfinal.log.Log; @@ -19,9 +22,7 @@ import com.jfinal.plugin.redis.Redis; import java.sql.SQLException; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.regex.Pattern; /** @@ -30,14 +31,13 @@ import java.util.regex.Pattern; * Remarks: * PrimaryKey: id */ -public class SysuserService extends BaseService { - private static Log log = Log.getLog(SysuserService.class); - private static final String pwdkey = "sysuser"; - public static final String tablename = "sysuser"; - public static final SysuserService me = new SysuserService(); - private static final Pattern rolepattern = Pattern.compile("[0-2]{3}"); - // private static int expireAt = 24 * 60 * 60; // 超时时间，单位秒 - private static int expireAt = 24 * 60 * 60; // 超时时间，单位秒 +public class SysuserSyncService extends BaseService { + private static Log log = Log.getLog(SysuserSyncService.class); + private static final String pwdkey = "sysuser"; + public static final String tablename = "sysuser"; + public static final SysuserSyncService me = new SysuserSyncService(); + private static final Pattern rolepattern = Pattern.compile("[0-2]{3}"); + private static int expireAt = 24 * 60 * 60; // 超时时间，单位秒 public String redisbasekey() { return Config.dbprop.get("redis.basekey") + Const.REDIS_SEPARATE + tablename + Const.REDIS_SEPARATE; @@ -198,248 +198,6 @@ public class SysuserService extends BaseService { return null; } - /** - * 已经做好相应的验证了 - * 多次使用的方法 - * 如果已经验证好了，不必要的验证就可以跳过了 - * - * @param model - * @return - */ - public boolean saveModel(Sysuser model) { - model.setPassword(getPwdMD5(model.getPhone(), Const.DEFAULT_PASSWORD)); - model.remove("id"); // 避免前端传 id - - return model.save(); - } - - /** - * 新增 - * 设置默认密码 - * - * @param model BaseModel - * @return Result - */ - public Result save(Sysuser model) { - try { - if (model.checkDuplicate("phone")) { - return Result.failed(false, "手机号已存在"); - } - - if (model.getType() == null || !UserTypeEnum.hasTypeId(model.getType())) { - return Result.failed(false, "type 必填"); - } - - if (model.getType() != null && UserTypeEnum.DRIVER.getTypeid().equals(model.getType())) { - return Result.failed(false, "不能直接在账号内添加司机"); - } - - if (!isTreasurer(model.getRole()) && !isPresident(model.getRole()) && !isConfigAdmin(model.getRole())) { - // 不是财务、经理的时候，按照原来的规则检查 - if (checkEntityId(model) == null) { - return Result.failed(false, "entity_id 未找到对应值"); - } - } - - boolean ret = saveModel(model); - - if (ret) { - model.setPassword(null); - - return Result.object(model); - } - - return Result.failed(false, "新增失败"); - } catch (Exception e) { - log.error(e.getMessage(), e); - if (e.getMessage().contains("PRIMARY")) { - return Result.failed(false, "主键冲突"); - } - if (e.getMessage().contains("Duplicate entry")) { - return Result.failed(false, "存在重复数据"); - } else { - return Result.failed(false, e.getMessage()); - } - } - } - - /** - * 修改 - * - * @param model BaseModel - * @return Result - */ - public Result update(Sysuser model) { - try { - Sysuser old = model.findByColumns("phone"); - Sysuser chkobj = model.findByPk(); // 按 id 找到旧的对象 - - // 注意这里有 ！，找到后才做 update 操作 - if (chkobj == null) { - return Result.failed(false, "按主键未找到对应记录"); - } - - model.setType(chkobj.getType()); // type 不让修改 - - // 按手机号查出来的记录，不的当前更新的记录 - if (old != null && !old.getId().equals(model.getId())) { - return Result.failed(false, "手机号已存在"); - } - - BaseModel baseModel = checkEntityId(model); - - if (isTreasurer(model.getRole()) || isPresident(model.getRole())) { - if (model.getEntityId() == null) { // 没有从前端获取到 entity_id - model.setEntityId(null); // 如果不设置，upate 时，不会更新 entity_id， 如果要清空 entity_id 值，就需要手动设置为 null - } - } else { - // 不是财务、经理的时候，按照原来的规则检查 - if (baseModel == null) { - return Result.failed(false, "entity_id 未找到对应值"); - } - } - - model.remove("password"); // 更新用户信息，不更新密码 - - boolean ret = Db.tx(new IAtom() { - @Override - public boolean run() throws SQLException { - boolean ret = model.update(); - - // 如果是司机，需要更新司机信息 -// if (ret && chkobj.getType() != null && chkobj.getType().equals(UserTypeEnum.DRIVER.getTypeid()) && baseModel != null) { -// // 目前暂时只更新姓名、手机号 -// -// Driver olddriver = (Driver)baseModel; -// -// olddriver.setName(model.getName()); -// olddriver.setPhone(model.getPhone()); -// -// ret = olddriver.update(); -// } - - return ret; - } - }); - - return ret ? Result.object(model) : Result.failed(false, "编辑失败"); - } catch (Exception e) { - log.error(e.getMessage(), e); - if (e.getMessage().contains("PRIMARY")) { - return Result.failed(false, "主键冲突"); - } - if (e.getMessage().contains("Duplicate entry")) { - return Result.failed(false, "存在重复数据"); - } else { - return Result.failed(false, e.getMessage()); - } - } - } - - - /** - * 恢复被逻辑删除的数据 - * - * @param model - * @return - */ - public Result restore(BaseModel model) { - try { - if (!model.hasDelKey()) { - return Result.failed(false, "不存在逻辑删除字段"); - } - - model.set(Const.LOGIC_DEL_KEY, Const.LOGIC_DEL_VALID); // 逻辑删除字段统一用 del - - boolean ret = model.update(); - - Sysuser sysuser = Sysuser.dao.findById(model.get("id")); - - sysuser.remove("password"); - - return ret ? Result.object(sysuser) : Result.failed(false, "恢复失败"); - } catch (Exception e) { - log.error(e.getMessage(), e); - return Result.failed(false, "恢复失败"); - } - } - - /** - * 用户修改相关提示信息会少一点 - * 避免别人试错 - * - * @param token - * @param oldpwd - * @param newpwd - * @return - */ - public Result updatePassword(String token, String oldpwd, String newpwd) { - try { - Sysuser tokenuser = getSysuserByToken(token); // 用 token 获取到的用户没有密码 - - if (tokenuser == null) { - return Result.failed(false, "修改失败"); - } - - Sysuser sysuser = Sysuser.dao.findById(tokenuser.getId()); // 需要再从数据库中查询一次 - - String oldmd5 = getPwdMD5(sysuser.getPhone(), oldpwd); - - if (!sysuser.getPassword().equals(oldmd5)) { - return Result.failed(false, "修改失败"); - } - - String newmd5 = getPwdMD5(sysuser.getPhone(), newpwd); - - sysuser.setPassword(newmd5); - - boolean ret = sysuser.update(); - - sysuser.remove("password"); - - return ret ? Result.object(sysuser) : Result.failed(false, "修改失败"); - } catch (Exception e) { - log.error(e.getMessage(), e); - return Result.failed(false, "修改失败"); - } - } - - - /** - * 重置密码 - * - * @param model 被修改的用户，只要id - * @param adminuser 验证当前用户是否是管理员 - * @return - */ - public Result resetPassword(Sysuser model, Sysuser adminuser) { - try { - // TODO 判断权限，若权限修改，这里也要调整 -// if (adminuser == null -// || !adminuser.getType().equals(UserTypeEnum.SUPERMARKET.getTypeid()) // 判断是否是砂场用户 -// || !adminuser.getRole().equals(RoleEnum.SUPERADMIN.getRoleid())) { // 判断是否是砂场管理员 -// return Result.permissionDenied(); -// } - - Sysuser sysuser = Sysuser.dao.findById(model.getId()); // 需要再从数据库中查询一次 - - if (sysuser == null) { - return Result.failed(false, "重置失败"); - } - - sysuser.setPassword(getPwdMD5(sysuser.getPhone(), Const.DEFAULT_PASSWORD)); - - boolean ret = sysuser.update(); - - sysuser.remove("password"); - - return ret ? Result.object(sysuser) : Result.failed(false, "重置失败"); - } catch (Exception e) { - log.error(e.getMessage(), e); - return Result.failed(false, "重置失败"); - } - } - public Sysuser getUserByWhere(String name, String phone, String password) { Sysuser sysuser = Sysuser.dao.findFirst("select * from sysuser where phone = ? and del = 0", phone); @@ -567,4 +325,62 @@ public class SysuserService extends BaseService { return Db.paginate(pp.getPage(), pp.getSize(), "select * ", sqlbuf.toString(), paraList.toArray()); } + + /** + * 用户修改相关提示信息会少一点 + * 避免别人试错 + * + * @param token + * @param oldpwd + * @param newpwd + * @return + */ + public Result updatePassword(String token, String oldpwd, String newpwd) { + try { + Sysuser tokenuser = getSysuserByToken(token); // 用 token 获取到的用户没有密码 + + if (tokenuser == null) { + return Result.failed(false, "修改失败"); + } + + Sysuser sysuser = Sysuser.dao.findById(tokenuser.getId()); // 需要再从数据库中查询一次 + + if (sysuser == null) { + return Result.failed(false, "修改失败"); + } + + Sysuser old = sysuser.clone(); + + String oldmd5 = getPwdMD5(sysuser.getPhone(), oldpwd); + + if (!sysuser.getPassword().equals(oldmd5)) { + return Result.failed(false, "修改失败"); + } + + String newmd5 = getPwdMD5(sysuser.getPhone(), newpwd); + + sysuser.setPassword(newmd5); + + boolean ret = Db.tx(new IAtom() { + @Override + public boolean run() throws SQLException { + boolean ret = sysuser.update(); + + if (!ret) { + return false; + } + + return SyncTaskService.me.save(new SyncTask().addUpdateData(sysuser)) + && ModifyLogService.me.save(sysuser, old, Enums.DataOpType.UPDATE.getId(), tokenuser); + } + }); + + sysuser.remove("password"); + + return ret ? Result.object(sysuser) : Result.failed(false, "修改失败"); + } catch (Exception e) { + log.error(e.getMessage(), e); + return Result.failed(false, "修改失败"); + } + } } diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportController.java index 81b2937..6d5a4b2 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportController.java @@ -5,10 +5,8 @@ import com.cowr.common.enums.Enums; import com.cowr.common.view.Result; import com.cowr.local.ssjygl.main.AuthInterceptor; import com.cowr.local.ssjygl.main.CliCacheData; -import com.cowr.local.ssjygl.system.sysuser.SysuserService; +import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.model.Sysuser; -import com.cowr.ssjygl.CacheData; -import com.cowr.ssjygl.order.OrderSnValidator; import com.cowr.ssjygl.transport.LicenseValidator; import com.cowr.ssjygl.transport.PostWeightValidator; import com.cowr.ssjygl.transport.TransportIdValidator; @@ -30,7 +28,7 @@ public class TransportController extends BaseController { */ @Before(LicenseValidator.class) public void addLicense() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.permissionDenied()); @@ -97,7 +95,7 @@ public class TransportController extends BaseController { */ @Before(LicenseValidator.class) public void manualIn() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.permissionDenied()); @@ -116,7 +114,7 @@ public class TransportController extends BaseController { */ @Before(ManualWeightValidator.class) public void manualWeight() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.permissionDenied()); @@ -138,7 +136,7 @@ public class TransportController extends BaseController { @Before({ManualCreateValidator.class}) public void manualCreate() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.permissionDenied()); @@ -167,7 +165,7 @@ public class TransportController extends BaseController { * //deviceid: scale1 */ public void cmdWeight() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.permissionDenied()); @@ -185,7 +183,7 @@ public class TransportController extends BaseController { @Before(CmdLicenseValidator.class) public void cmdAddPlate() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.permissionDenied()); @@ -212,7 +210,7 @@ public class TransportController extends BaseController { @Before(CmdLicenseValidator.class) public void cmdDelPlate() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.permissionDenied()); @@ -235,7 +233,7 @@ public class TransportController extends BaseController { } public void cmdResetFlow() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.permissionDenied()); @@ -253,7 +251,7 @@ public class TransportController extends BaseController { } public void cmdRodUp() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.permissionDenied()); @@ -273,7 +271,7 @@ public class TransportController extends BaseController { @Before(TransportIdValidator.class) public void cancel() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.permissionDenied()); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java index 504f59a..d7636e6 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java @@ -11,7 +11,7 @@ import com.cowr.local.ssjygl.main.CliCacheData; import com.cowr.local.ssjygl.main.Config; import com.cowr.local.ssjygl.order.OrderService; import com.cowr.local.ssjygl.synctask.SyncTaskService; -import com.cowr.local.ssjygl.system.sysuser.SysuserService; +import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.model.*; import com.cowr.ssjygl.CacheData; import com.cowr.ssjygl.authlicense.AuthLicenseService; @@ -29,7 +29,6 @@ import net.coobird.thumbnailator.Thumbnails; import java.io.File; import java.math.BigDecimal; -import java.sql.SQLException; import java.util.*; /** @@ -568,7 +567,7 @@ public class TransportSyncService { public Result manualCreate(int supermarket_id, String truck_license, double first_weight, double second_weight, String out_which, Sysuser sysuser, String password) { try { // 重新验证密码 - Sysuser chkuser = SysuserService.me.getUserByWhere(null, sysuser.getPhone(), password); + Sysuser chkuser = SysuserSyncService.me.getUserByWhere(null, sysuser.getPhone(), password); if (chkuser == null) { log.debug("用户输入密码错误"); @@ -703,7 +702,7 @@ public class TransportSyncService { */ public Result manualWeight(String transport_id, String which, double weight, Sysuser sysuser, String password) { // 重新验证密码 - Sysuser chkuser = SysuserService.me.getUserByWhere(null, sysuser.getPhone(), password); + Sysuser chkuser = SysuserSyncService.me.getUserByWhere(null, sysuser.getPhone(), password); if (chkuser == null) { log.debug("用户输入密码错误"); diff --git a/ssjygl-xsx-local/src/main/resources/dev/config.properties b/ssjygl-xsx-local/src/main/resources/dev/config.properties index 371ffff..f246250 100644 --- a/ssjygl-xsx-local/src/main/resources/dev/config.properties +++ b/ssjygl-xsx-local/src/main/resources/dev/config.properties @@ -1,9 +1,9 @@ devMode=true #本地服务 和 云端服务 socket 通信 -socketserver.enable=false +socketserver.enable=true #socketserver.host=47.112.109.118 -socketserver.host=127.0.0.1 +socketserver.host=192.168.1.16 socketserver.port=21002 #和 web 端的 socket.io 通信端口 @@ -13,8 +13,8 @@ socketio.port=12002 current.supermarket_id=1 #打印用到的配置信息 -print.vendor=湖北 -print.vendorTaxId=9142 +print.vendor=浠水县长投环保有限公司 +print.vendorTaxId=91421125MA49GYYK2B #如果物流车辆入场重量大大超过皮重（>=10%），则认为是转运车辆 #2019-08-01 暂定 50% diff --git a/ssjygl-xsx-local/src/main/resources/dev/db.properties b/ssjygl-xsx-local/src/main/resources/dev/db.properties index c183203..17cde35 100644 --- a/ssjygl-xsx-local/src/main/resources/dev/db.properties +++ b/ssjygl-xsx-local/src/main/resources/dev/db.properties @@ -1,11 +1,16 @@ # mysql -jdbcUrl=jdbc:mysql://rm-wz9wa070076b2uge2ro.mysql.rds.aliyuncs.com:3306/ssjy_xsx_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true -user=ssjy_xsx -password=Ssjy_xs_890 +# GRANT ALL PRIVILEGES ON *.* TO 'root'@'192.168.1.119' IDENTIFIED BY 'Local_1' WITH GRANT OPTION; +#jdbcUrl=jdbc:mysql://rm-wz9wa070076b2uge2ro.mysql.rds.aliyuncs.com:3306/ssjy_xsx_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true +#user=ssjy_xsx +#password=Ssjy_xs_890 + +jdbcUrl=jdbc:mysql://192.168.1.119:3306/ssjy_xsx_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true +user=root +password=Local_1 # redis redis.basekey = ssjcgl_xsx_dev -redis.ip=r-wz9168ab2f2f7ec4pd.redis.rds.aliyuncs.com +redis.ip=192.168.1.119 redis.port=6379 -redis.pwd=CoWR1111 -redis.db=13 \ No newline at end of file +redis.pwd= +redis.db= \ No newline at end of file diff --git a/ssjygl-xsx-local/src/main/resources/job.properties b/ssjygl-xsx-local/src/main/resources/job.properties index 6c83b2e..61d2f0b 100644 --- a/ssjygl-xsx-local/src/main/resources/job.properties +++ b/ssjygl-xsx-local/src/main/resources/job.properties @@ -1,4 +1,4 @@ #.job 部分前面不能以 job结尾 synctask.job=com.cowr.local.ssjygl.jobs.SyncJob synctask.cron= 0 * * * * ? -synctask.enable=false \ No newline at end of file +synctask.enable=true \ No newline at end of file diff --git a/ssjygl-xsx-local/src/main/resources/prod/config.properties b/ssjygl-xsx-local/src/main/resources/prod/config.properties index 1f30e05..2669d2b 100644 --- a/ssjygl-xsx-local/src/main/resources/prod/config.properties +++ b/ssjygl-xsx-local/src/main/resources/prod/config.properties @@ -1,7 +1,7 @@ devMode=true #本地服务 和 云端服务 socket 通信 -socketserver.enable=false +socketserver.enable=true #socketserver.host=47.112.109.118 socketserver.host=127.0.0.1 socketserver.port=21002 @@ -13,8 +13,8 @@ socketio.port=12002 current.supermarket_id=1 #打印用到的配置信息 -print.vendor=湖北 -print.vendorTaxId=9142 +print.vendor=浠水县长投环保有限公司 +print.vendorTaxId=91421125MA49GYYK2B #如果物流车辆入场重量大大超过皮重（>=10%），则认为是转运车辆 #2019-08-01 暂定 50% diff --git a/ssjygl-xsx-local/src/main/resources/prod/db.properties b/ssjygl-xsx-local/src/main/resources/prod/db.properties index 8f1b47f..4e592ea 100644 --- a/ssjygl-xsx-local/src/main/resources/prod/db.properties +++ b/ssjygl-xsx-local/src/main/resources/prod/db.properties @@ -5,7 +5,7 @@ password=Ssjy_xs_890 # redis redis.basekey = ssjcgl_xsx -redis.ip=192.168.0.219 +redis.ip=192.168.1.119 redis.port=6379 redis.pwd= redis.db= \ No newline at end of file diff --git a/ssjygl-xsx-local/start.sh b/ssjygl-xsx-local/start.sh index 107bbcf..b8f12cc 100644 --- a/ssjygl-xsx-local/start.sh +++ b/ssjygl-xsx-local/start.sh @@ -40,8 +40,7 @@ CP=${APP_BASE_PATH}/config:${APP_BASE_PATH}/lib/* # nohup java -Xverify:none ${JAVA_OPTS} -cp ${CP} ${MAIN_CLASS} > output.log & # 运行为非后台进程，多用于开发阶段，快捷键 ctrl + c 可停止服务 -/home/admin123456/hsjygl_hzq/jdk1.8.0_251/bin/java -Xverify:none ${JAVA_OPTS} -cp ${CP} ${MAIN_CLASS} -#java -Xverify:none ${JAVA_OPTS} -cp ${CP} ${MAIN_CLASS} +java -Xverify:none ${JAVA_OPTS} -cp ${CP} ${MAIN_CLASS} diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/base/BaseSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/base/BaseSyncService.java index d1fb277..7c3115e 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/base/BaseSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/base/BaseSyncService.java @@ -72,16 +72,16 @@ public class BaseSyncService extends BaseService { */ public Result delete(BaseModel model, Sysuser sysuser) { try { - // 如果存在逻辑删除字段 del，则只做逻辑删除，不做物理删除 - if (model.hasDelKey()) { - return logicDel(model, sysuser); - } - // 注意这里有 ！，找到后才做 delete 操作 if (!model.checkExistsByPk()) { return Result.failed(false, "按主键未找到对应记录"); } + // 如果存在逻辑删除字段 del，则只做逻辑删除，不做物理删除 + if (model.hasDelKey()) { + return logicDel(model, sysuser); // BaseService 中的 update 已经被 BaseSyncService 里面的 update 覆盖 + } + boolean ret = Db.tx(new IAtom() { @Override public boolean run() { diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/blacklist/BlacklistController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/blacklist/BlacklistController.java index e3f3908..302f0a7 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/blacklist/BlacklistController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/blacklist/BlacklistController.java @@ -5,7 +5,7 @@ import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.model.Blacklist; import com.cowr.model.Sysuser; -import com.cowr.service.ssjygl.system.sysuser.SysuserService; +import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.ssjygl.blacklist.BlacklistPKValidator; import com.cowr.ssjygl.blacklist.BlacklistService; import com.cowr.ssjygl.blacklist.BlacklistValidator; @@ -36,7 +36,7 @@ public class BlacklistController extends BaseController { */ @Before(BlacklistValidator.class) public void save(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -84,7 +84,7 @@ public class BlacklistController extends BaseController { @Before(BlacklistPKValidator.class) public void remove(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/CustomerController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/CustomerController.java index b2a46b0..68cf3b7 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/CustomerController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/CustomerController.java @@ -4,7 +4,7 @@ import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.model.Customer; import com.cowr.model.Sysuser; -import com.cowr.service.ssjygl.system.sysuser.SysuserService; +import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.ssjygl.customer.CustomerPKValidator; import com.cowr.ssjygl.customer.CustomerService; import com.cowr.ssjygl.customer.CustomerValidator; @@ -36,7 +36,7 @@ public class CustomerController extends Controller { */ @Before(CustomerValidator.class) public void save(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -52,7 +52,7 @@ public class CustomerController extends Controller { */ @Before(CustomerPKValidator.class) public void del(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -68,7 +68,7 @@ public class CustomerController extends Controller { */ @Before(CustomerPKValidator.class) public void restore(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -84,7 +84,7 @@ public class CustomerController extends Controller { */ @Before(CustomerValidator.class) public void edit(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/contact/CustomerContactController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/contact/CustomerContactController.java index 84f6a2b..5bb67ec 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/contact/CustomerContactController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/contact/CustomerContactController.java @@ -4,7 +4,7 @@ import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.model.CustomerContact; import com.cowr.model.Sysuser; -import com.cowr.service.ssjygl.system.sysuser.SysuserService; +import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.ssjygl.customer.contact.CustomerContactPKValidator; import com.cowr.ssjygl.customer.contact.CustomerContactService; import com.cowr.ssjygl.customer.contact.CustomerContactValidator; @@ -36,7 +36,7 @@ public class CustomerContactController extends Controller { */ @Before(CustomerContactValidator.class) public void save(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -52,7 +52,7 @@ public class CustomerContactController extends Controller { */ @Before(CustomerContactPKValidator.class) public void del(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -68,7 +68,7 @@ public class CustomerContactController extends Controller { */ @Before(CustomerContactPKValidator.class) public void restore(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -84,7 +84,7 @@ public class CustomerContactController extends Controller { */ @Before(CustomerContactValidator.class) public void edit(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/receiver/CustomerReceiverController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/receiver/CustomerReceiverController.java index 1e24495..f99148e 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/receiver/CustomerReceiverController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/receiver/CustomerReceiverController.java @@ -4,7 +4,7 @@ import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.model.CustomerReceiver; import com.cowr.model.Sysuser; -import com.cowr.service.ssjygl.system.sysuser.SysuserService; +import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.ssjygl.customer.receiver.CustomerReceiverPKValidator; import com.cowr.ssjygl.customer.receiver.CustomerReceiverService; import com.cowr.ssjygl.customer.receiver.CustomerReceiverValidator; @@ -36,7 +36,7 @@ public class CustomerReceiverController extends Controller { */ @Before(CustomerReceiverValidator.class) public void save() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -52,7 +52,7 @@ public class CustomerReceiverController extends Controller { */ @Before(CustomerReceiverPKValidator.class) public void del() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -68,7 +68,7 @@ public class CustomerReceiverController extends Controller { */ @Before(CustomerReceiverPKValidator.class) public void restore() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -84,7 +84,7 @@ public class CustomerReceiverController extends Controller { */ @Before(CustomerReceiverValidator.class) public void edit() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/driver/DriverController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/driver/DriverController.java index b3fc6e3..be8f974 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/driver/DriverController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/driver/DriverController.java @@ -4,7 +4,7 @@ import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.model.Driver; import com.cowr.model.Sysuser; -import com.cowr.service.ssjygl.system.sysuser.SysuserService; +import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.ssjygl.driver.DriverPKValidator; import com.cowr.ssjygl.driver.DriverService; import com.cowr.ssjygl.driver.DriverValidator; @@ -36,7 +36,7 @@ public class DriverController extends Controller { */ @Before(DriverValidator.class) public void save(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -52,7 +52,7 @@ public class DriverController extends Controller { */ @Before(DriverPKValidator.class) public void del(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -68,7 +68,7 @@ public class DriverController extends Controller { */ @Before(DriverPKValidator.class) public void restore(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -84,7 +84,7 @@ public class DriverController extends Controller { */ @Before(DriverValidator.class) public void edit(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/AuthInterceptor.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/AuthInterceptor.java index 4c91c35..78749eb 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/AuthInterceptor.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/AuthInterceptor.java @@ -2,7 +2,7 @@ package com.cowr.service.ssjygl.main; import com.cowr.common.view.Result; import com.cowr.model.Sysuser; -import com.cowr.service.ssjygl.system.sysuser.SysuserService; +import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; @@ -39,7 +39,7 @@ public class AuthInterceptor implements Interceptor { return; } - Sysuser sysuser = SysuserService.me.getSysuserByToken(token); + Sysuser sysuser = SysuserSyncService.me.getSysuserByToken(token); if (sysuser == null) { c.renderJson(Result.noauth()); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterController.java index baab1c9..14fd047 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterController.java @@ -5,7 +5,7 @@ import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.model.Ordercluster; import com.cowr.model.Sysuser; -import com.cowr.service.ssjygl.system.sysuser.SysuserService; +import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.ssjygl.order.ordercluster.OrderclusterPKValidator; import com.cowr.ssjygl.order.ordercluster.OrderclusterService; import com.cowr.ssjygl.order.ordercluster.OrderclusterValidator; @@ -19,7 +19,7 @@ public class OrderclusterController extends BaseController { */ @Before(OrderclusterValidator.class) public void save(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -35,7 +35,7 @@ public class OrderclusterController extends BaseController { */ @Before(OrderclusterEditValidator.class) public void edit(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -85,7 +85,7 @@ public class OrderclusterController extends BaseController { } public void cancel(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -98,7 +98,7 @@ public class OrderclusterController extends BaseController { } public void complete(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaydetail/PrepayDetailController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaydetail/PrepayDetailController.java index 91cb56b..b717fe1 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaydetail/PrepayDetailController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaydetail/PrepayDetailController.java @@ -7,7 +7,7 @@ import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.model.PrepayDetail; import com.cowr.model.Sysuser; -import com.cowr.service.ssjygl.system.sysuser.SysuserService; +import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.ssjygl.prepay.prepaydetail.PrepayDetailPKValidator; import com.cowr.ssjygl.prepay.prepaydetail.PrepayDetailService; import com.cowr.ssjygl.prepay.prepaydetail.PrepayDetailValidator; @@ -40,7 +40,7 @@ public class PrepayDetailController extends Controller { */ @Before(PrepayDetailValidator.class) public void save(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -56,7 +56,7 @@ public class PrepayDetailController extends Controller { */ @Before(PrepayDetailPKValidator.class) public void del(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -72,7 +72,7 @@ public class PrepayDetailController extends Controller { */ @Before(PrepayDetailPKValidator.class) public void restore(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -88,7 +88,7 @@ public class PrepayDetailController extends Controller { */ @Before(PrepayDetailValidator.class) public void edit(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -149,7 +149,7 @@ public class PrepayDetailController extends Controller { @Before(PrepayDetailVerifyValidator.class) public void verify(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaydetail/PrepayDetailSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaydetail/PrepayDetailSyncService.java index 1224adb..48bae2d 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaydetail/PrepayDetailSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaydetail/PrepayDetailSyncService.java @@ -5,7 +5,7 @@ import com.cowr.common.view.Result; import com.cowr.model.*; import com.cowr.service.ssjygl.base.BaseSyncService; import com.cowr.service.ssjygl.synctask.SyncTaskService; -import com.cowr.service.ssjygl.system.sysuser.SysuserService; +import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.ssjygl.modifylog.ModifyLogService; import com.cowr.ssjygl.prepay.prepaycustomer.PrepayCustomerService; import com.jfinal.kit.StrKit; @@ -88,7 +88,7 @@ public class PrepayDetailSyncService extends BaseSyncService { * @return */ public Result verify(String id, int state, String memo, Sysuser user) { - if (!SysuserService.me.isPresident(user.getRole())) { // 总经理审核预付费 + if (!SysuserSyncService.me.isPresident(user.getRole())) { // 总经理审核预付费 return Result.permissionDenied(); } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailController.java index cd435ec..fd236cc 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailController.java @@ -5,7 +5,7 @@ import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.model.RefundDetail; import com.cowr.model.Sysuser; -import com.cowr.service.ssjygl.system.sysuser.SysuserService; +import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.ssjygl.prepay.refunddetail.*; import com.jfinal.aop.Before; @@ -36,7 +36,7 @@ public class RefundDetailController extends BaseController { */ @Before(RefundDetailValidator.class) public void save(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -52,7 +52,7 @@ public class RefundDetailController extends BaseController { */ @Before(RefundDetailPKValidator.class) public void del(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -68,7 +68,7 @@ public class RefundDetailController extends BaseController { */ @Before(RefundDetailPKValidator.class) public void restore(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -84,7 +84,7 @@ public class RefundDetailController extends BaseController { */ @Before(RefundDetailValidator.class) public void edit(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -135,7 +135,7 @@ public class RefundDetailController extends BaseController { @Before(RefundDetailVerifyValidator.class) public void verify(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -150,7 +150,7 @@ public class RefundDetailController extends BaseController { } @Before(RefundDetailConfirmValidator.class) public void confirm(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailSyncService.java index 47995d6..9a3dd45 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailSyncService.java @@ -5,7 +5,7 @@ import com.cowr.common.view.Result; import com.cowr.model.*; import com.cowr.service.ssjygl.base.BaseSyncService; import com.cowr.service.ssjygl.synctask.SyncTaskService; -import com.cowr.service.ssjygl.system.sysuser.SysuserService; +import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.ssjygl.modifylog.ModifyLogService; import com.cowr.ssjygl.prepay.prepaycustomer.PrepayCustomerService; import com.jfinal.kit.StrKit; @@ -109,7 +109,7 @@ public class RefundDetailSyncService extends BaseSyncService { * @return */ public Result verify(String id, int state, String memo, Sysuser user) { - if (!SysuserService.me.isPresident(user.getRole())) { // 总经理审核退费 + if (!SysuserSyncService.me.isPresident(user.getRole())) { // 总经理审核退费 return Result.permissionDenied(); } @@ -207,7 +207,7 @@ public class RefundDetailSyncService extends BaseSyncService { */ public Result confirm(String id, BigDecimal amount, String serialnum, Sysuser user) { try { - if (!SysuserService.me.isTreasurer(user.getRole())) { // 财务执行退费 + if (!SysuserSyncService.me.isTreasurer(user.getRole())) { // 财务执行退费 return Result.permissionDenied(); } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/product/ProductController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/product/ProductController.java index c238b69..7ad8dad 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/product/ProductController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/product/ProductController.java @@ -4,7 +4,7 @@ import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.model.Product; import com.cowr.model.Sysuser; -import com.cowr.service.ssjygl.system.sysuser.SysuserService; +import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.ssjygl.product.ProductPKValidator; import com.cowr.ssjygl.product.ProductService; import com.cowr.ssjygl.product.ProductValidator; @@ -36,7 +36,7 @@ public class ProductController extends Controller { */ @Before(ProductValidator.class) public void save(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -52,7 +52,7 @@ public class ProductController extends Controller { */ @Before(ProductPKValidator.class) public void del(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -68,7 +68,7 @@ public class ProductController extends Controller { */ @Before(ProductPKValidator.class) public void restore(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -84,7 +84,7 @@ public class ProductController extends Controller { */ @Before(ProductValidator.class) public void edit(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/purchase/PurchaseController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/purchase/PurchaseController.java index 5676c34..98108a0 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/purchase/PurchaseController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/purchase/PurchaseController.java @@ -4,7 +4,7 @@ import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.model.Purchase; import com.cowr.model.Sysuser; -import com.cowr.service.ssjygl.system.sysuser.SysuserService; +import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.ssjygl.purchase.PurchasePKValidator; import com.cowr.ssjygl.purchase.PurchaseService; import com.cowr.ssjygl.purchase.PurchaseValidator; @@ -36,7 +36,7 @@ public class PurchaseController extends Controller { */ @Before(PurchaseValidator.class) public void save(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -52,7 +52,7 @@ public class PurchaseController extends Controller { */ @Before(PurchasePKValidator.class) public void del(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -68,7 +68,7 @@ public class PurchaseController extends Controller { */ @Before(PurchasePKValidator.class) public void restore(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -84,7 +84,7 @@ public class PurchaseController extends Controller { */ @Before(PurchaseValidator.class) public void edit(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/sandfarm/SandfarmController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/sandfarm/SandfarmController.java index 1460552..d16aa9e 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/sandfarm/SandfarmController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/sandfarm/SandfarmController.java @@ -4,7 +4,7 @@ import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.model.Sandfarm; import com.cowr.model.Sysuser; -import com.cowr.service.ssjygl.system.sysuser.SysuserService; +import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.ssjygl.sandfarm.SandfarmPKValidator; import com.cowr.ssjygl.sandfarm.SandfarmService; import com.cowr.ssjygl.sandfarm.SandfarmValidator; @@ -36,7 +36,7 @@ public class SandfarmController extends Controller { */ @Before(SandfarmValidator.class) public void save(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -52,7 +52,7 @@ public class SandfarmController extends Controller { */ @Before(SandfarmPKValidator.class) public void del(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -68,7 +68,7 @@ public class SandfarmController extends Controller { */ @Before(SandfarmPKValidator.class) public void restore(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -84,7 +84,7 @@ public class SandfarmController extends Controller { */ @Before(SandfarmValidator.class) public void edit(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/SupermarketController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/SupermarketController.java index 221ea02..3dccc19 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/SupermarketController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/SupermarketController.java @@ -5,7 +5,7 @@ import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.model.Supermarket; import com.cowr.model.Sysuser; -import com.cowr.service.ssjygl.system.sysuser.SysuserService; +import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.ssjygl.supermarket.SupermarketPKValidator; import com.cowr.ssjygl.supermarket.SupermarketService; import com.cowr.ssjygl.supermarket.SupermarketValidator; @@ -24,7 +24,7 @@ public class SupermarketController extends BaseController { */ @Before(SupermarketValidator.class) public void edit(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -64,7 +64,7 @@ public class SupermarketController extends BaseController { @Before(SupAddProductValidator.class) public void addProduct(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -80,7 +80,7 @@ public class SupermarketController extends BaseController { @Before(SupRemoveProductValidator.class) public void removeProduct(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceController.java index 9be8476..8825f5d 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceController.java @@ -4,7 +4,7 @@ import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.model.SupermarketReceiverDistance; import com.cowr.model.Sysuser; -import com.cowr.service.ssjygl.system.sysuser.SysuserService; +import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.ssjygl.supermarket.receiverdistance.SupermarketReceiverDistancePKValidator; import com.cowr.ssjygl.supermarket.receiverdistance.SupermarketReceiverDistanceService; import com.cowr.ssjygl.supermarket.receiverdistance.SupermarketReceiverDistanceValidator; @@ -36,7 +36,7 @@ public class SupermarketReceiverDistanceController extends Controller { */ @Before(SupermarketReceiverDistanceValidator.class) public void save(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -49,7 +49,7 @@ public class SupermarketReceiverDistanceController extends Controller { @Before(SupermarketReceiverDistanceValidator.class) public void saveOrupdate(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -65,7 +65,7 @@ public class SupermarketReceiverDistanceController extends Controller { */ @Before(SupermarketReceiverDistancePKValidator.class) public void del(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -81,7 +81,7 @@ public class SupermarketReceiverDistanceController extends Controller { */ @Before(SupermarketReceiverDistancePKValidator.class) public void restore(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -97,7 +97,7 @@ public class SupermarketReceiverDistanceController extends Controller { */ @Before(SupermarketReceiverDistanceValidator.class) public void edit(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceController.java index be14cc8..c046e82 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceController.java @@ -4,7 +4,7 @@ import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.model.SupermarketSandfarmDistance; import com.cowr.model.Sysuser; -import com.cowr.service.ssjygl.system.sysuser.SysuserService; +import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.ssjygl.supermarket.sandfarmdistance.SupermarketSandfarmDistancePKValidator; import com.cowr.ssjygl.supermarket.sandfarmdistance.SupermarketSandfarmDistanceService; import com.cowr.ssjygl.supermarket.sandfarmdistance.SupermarketSandfarmDistanceValidator; @@ -37,7 +37,7 @@ public class SupermarketSandfarmDistanceController extends Controller { */ @Before(SupermarketSandfarmDistanceValidator.class) public void save(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -53,7 +53,7 @@ public class SupermarketSandfarmDistanceController extends Controller { */ @Before(SupermarketSandfarmDistancePKValidator.class) public void del(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -69,7 +69,7 @@ public class SupermarketSandfarmDistanceController extends Controller { */ @Before(SupermarketSandfarmDistancePKValidator.class) public void restore(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -86,7 +86,7 @@ public class SupermarketSandfarmDistanceController extends Controller { */ @Before(SupermarketSandfarmDistanceValidator.class) public void edit(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/synctask/SyncTaskService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/synctask/SyncTaskService.java index eaf1251..83a0f4c 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/synctask/SyncTaskService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/synctask/SyncTaskService.java @@ -13,6 +13,7 @@ import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.IAtom; import com.jfinal.plugin.activerecord.Record; +import java.sql.SQLException; import java.util.*; /** @@ -65,9 +66,33 @@ public class SyncTaskService { return true; } else { - int[] ret = Db.batchSave(list, list.size()); + boolean ret = Db.tx(new IAtom() { + @Override + public boolean run() throws SQLException { + try{ + int[] ret = Db.batchSave(list, list.size()); - return ret.length == list.size(); // 有插入的，还是需要返回插入状态 + for(int i : ret){ + if( i != 1){ + return false; + } + } + + return true; + }catch (Exception e){ + log.error(e.getMessage(), e); + return false; + } + } + }); + + if(ret){ + for(SyncTask obj : list){ + send(obj); + } + } + + return ret; // 有插入的，还是需要返回插入状态 } } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserController.java index c5a4970..583aa97 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserController.java @@ -29,7 +29,7 @@ public class SysuserController extends Controller { @Before(SysuserPKValidator.class) public void checkExistsByPk(){ Sysuser model = getModel(Sysuser.class, "", true); // 忽略不在model中的字段 - renderJson(SysuserService.me.checkExistsByPk(model)); + renderJson(SysuserSyncService.me.checkExistsByPk(model)); } /** @@ -37,8 +37,15 @@ public class SysuserController extends Controller { */ @Before(SysuserValidator.class) public void save(){ + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); + + if (tokenuser == null) { + renderJson(Result.noauth()); + return; + } + Sysuser model = getModel(Sysuser.class, "", true); // 忽略不在model中的字段 - renderJson(SysuserService.me.save(model)); + renderJson(SysuserSyncService.me.save(model, tokenuser)); } /** @@ -46,8 +53,15 @@ public class SysuserController extends Controller { */ @Before(SysuserPKValidator.class) public void del(){ + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); + + if (tokenuser == null) { + renderJson(Result.noauth()); + return; + } + Sysuser model = getModel(Sysuser.class, "", true); // 忽略不在model中的字段 - renderJson(SysuserService.me.delete(model)); + renderJson(SysuserSyncService.me.delete(model, tokenuser)); } /** @@ -55,8 +69,15 @@ public class SysuserController extends Controller { */ @Before(SysuserPKValidator.class) public void restore(){ + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); + + if (tokenuser == null) { + renderJson(Result.noauth()); + return; + } + Sysuser model = getModel(Sysuser.class, "", true); // 忽略不在model中的字段 - renderJson(SysuserService.me.restore(model)); + renderJson(SysuserSyncService.me.restore(model, tokenuser)); } /** @@ -64,8 +85,15 @@ public class SysuserController extends Controller { */ @Before(SysuserValidator.class) public void edit(){ + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); + + if (tokenuser == null) { + renderJson(Result.noauth()); + return; + } + Sysuser model = getModel(Sysuser.class, "", true); // 忽略不在model中的字段 - renderJson(SysuserService.me.update(model)); + renderJson(SysuserSyncService.me.update(model, tokenuser)); } /** @@ -78,7 +106,7 @@ public class SysuserController extends Controller { Integer del = getInt("del", Const.LOGIC_DEL_VALID); // 默认显示未删除的 Integer type = getInt("type"); Integer entity_id = getInt("entity_id"); - renderJson(Result.object(SysuserService.me.find(pp, name, phone, del, type, entity_id))); + renderJson(Result.object(SysuserSyncService.me.find(pp, name, phone, del, type, entity_id))); } /** @@ -87,7 +115,7 @@ public class SysuserController extends Controller { @Before(SysuserPKValidator.class) public void findByPk(){ Sysuser model = getModel(Sysuser.class, "", true); // 忽略不在model中的字段 - renderJson(SysuserService.me.findByPk(model)); + renderJson(SysuserSyncService.me.findByPk(model)); } @Clear(AuthInterceptor.class) @@ -96,7 +124,7 @@ public class SysuserController extends Controller { String phone = get("phone", "").trim(); String password = get("password", ""); - renderJson(SysuserService.me.login(name, phone, password)); + renderJson(SysuserSyncService.me.login(name, phone, password)); } /** @@ -109,7 +137,7 @@ public class SysuserController extends Controller { if(!StrUtil.isPhone(phone)){ renderJson(Result.success(false)); }else{ - renderJson(Result.success(SysuserService.me.checkPhone(phone))); + renderJson(Result.success(SysuserSyncService.me.checkPhone(phone))); } } @@ -121,7 +149,7 @@ public class SysuserController extends Controller { String oldpwd = get("oldpwd", ""); String newpwd = get("newpwd", ""); - renderJson(SysuserService.me.updatePassword(token, oldpwd, newpwd)); + renderJson(SysuserSyncService.me.updatePassword(token, oldpwd, newpwd)); } /** @@ -129,7 +157,7 @@ public class SysuserController extends Controller { */ @Before(SysuserPKValidator.class) public void resetpwd(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -137,6 +165,6 @@ public class SysuserController extends Controller { } Sysuser model = getModel(Sysuser.class, "", true); // 忽略不在model中的字段 - renderJson(SysuserService.me.resetPassword(model, tokenuser)); + renderJson(SysuserSyncService.me.resetPassword(model, tokenuser)); } } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserSyncService.java similarity index 77% rename from ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserService.java rename to ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserSyncService.java index 748b7bc..3e9b3da 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserSyncService.java @@ -3,11 +3,15 @@ package com.cowr.service.ssjygl.system.sysuser; import com.cowr.common.Const; import com.cowr.common.base.BaseModel; import com.cowr.common.base.BaseService; +import com.cowr.common.enums.Enums; import com.cowr.common.enums.UserTypeEnum; import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.model.*; +import com.cowr.service.ssjygl.base.BaseSyncService; import com.cowr.service.ssjygl.main.Config; +import com.cowr.service.ssjygl.synctask.SyncTaskService; +import com.cowr.ssjygl.modifylog.ModifyLogService; import com.jfinal.kit.HashKit; import com.jfinal.kit.StrKit; import com.jfinal.log.Log; @@ -28,14 +32,14 @@ import java.util.regex.Pattern; * Remarks: * PrimaryKey: id */ -public class SysuserService extends BaseService { - private static Log log = Log.getLog(SysuserService.class); - private static final String pwdkey = "sysuser"; - public static final String tablename = "sysuser"; - public static final SysuserService me = new SysuserService(); - private static final Pattern rolepattern = Pattern.compile("[0-2]{3}"); +public class SysuserSyncService extends BaseSyncService { + private static Log log = Log.getLog(SysuserSyncService.class); + private static final String pwdkey = "sysuser"; + public static final String tablename = "sysuser"; + public static final SysuserSyncService me = new SysuserSyncService(); + private static final Pattern rolepattern = Pattern.compile("[0-2]{3}"); // private static int expireAt = 24 * 60 * 60; // 超时时间，单位秒 - private static int expireAt = 24 * 60 * 60; // 超时时间，单位秒 + private static int expireAt = 24 * 60 * 60; // 超时时间，单位秒 public String redisbasekey() { return Config.dbprop.get("redis.basekey") + Const.REDIS_SEPARATE + tablename + Const.REDIS_SEPARATE; @@ -196,21 +200,6 @@ public class SysuserService extends BaseService { return null; } - /** - * 已经做好相应的验证了 - * 多次使用的方法 - * 如果已经验证好了，不必要的验证就可以跳过了 - * - * @param model - * @return - */ - public boolean saveModel(Sysuser model) { - model.setPassword(getPwdMD5(model.getPhone(), Const.DEFAULT_PASSWORD)); - model.remove("id"); // 避免前端传 id - - return model.save(); - } - /** * 新增 * 设置默认密码 @@ -218,7 +207,7 @@ public class SysuserService extends BaseService { * @param model BaseModel * @return Result */ - public Result save(Sysuser model) { + public Result save(Sysuser model, Sysuser tokenuser) { try { if (model.checkDuplicate("phone")) { return Result.failed(false, "手机号已存在"); @@ -239,7 +228,27 @@ public class SysuserService extends BaseService { } } - boolean ret = saveModel(model); + model.setPassword(getPwdMD5(model.getPhone(), Const.DEFAULT_PASSWORD)); + model.remove("id"); // 避免前端传 id + + boolean ret =Db.tx(new IAtom() { + @Override + public boolean run() throws SQLException { + try { + boolean ret = model.save(); + + if (!ret) { + return false; + } + + return SyncTaskService.me.save(new SyncTask().addSaveData(model)) + && ModifyLogService.me.save(model, null, Enums.DataOpType.SAVE.getId(), tokenuser); + }catch (Exception e){ + log.error(e.getMessage(), e); + return false; + } + } + }); if (ret) { model.setPassword(null); @@ -267,7 +276,7 @@ public class SysuserService extends BaseService { * @param model BaseModel * @return Result */ - public Result update(Sysuser model) { + public Result update(Sysuser model, Sysuser tokenuser) { try { Sysuser old = model.findByColumns("phone"); Sysuser chkobj = model.findByPk(); // 按 id 找到旧的对象 @@ -277,9 +286,7 @@ public class SysuserService extends BaseService { return Result.failed(false, "按主键未找到对应记录"); } - model.setType(chkobj.getType()); // type 不让修改 - - // 按手机号查出来的记录，不的当前更新的记录 + // 按手机号查出来的记录，不是当前更新的记录 if (old != null && !old.getId().equals(model.getId())) { return Result.failed(false, "手机号已存在"); } @@ -297,30 +304,37 @@ public class SysuserService extends BaseService { } } + // TODO: 修改手机号码，必须重置密码 + if(model.getPhone() != null && !model.getPhone().equals(chkobj.getPhone())){ + chkobj.setPassword(getPwdMD5(model.getPhone(), Const.DEFAULT_PASSWORD)); + } + model.remove("password"); // 更新用户信息，不更新密码 + for(String key : model._getAttrNames()){ + if(model.get(key) != null){ + chkobj.set(key, model.get(key)); + } + } + boolean ret = Db.tx(new IAtom() { @Override public boolean run() throws SQLException { - boolean ret = model.update(); + boolean ret = chkobj.update(); - // 如果是司机，需要更新司机信息 -// if (ret && chkobj.getType() != null && chkobj.getType().equals(UserTypeEnum.DRIVER.getTypeid()) && baseModel != null) { -// // 目前暂时只更新姓名、手机号 -// -// Driver olddriver = (Driver)baseModel; -// -// olddriver.setName(model.getName()); -// olddriver.setPhone(model.getPhone()); -// -// ret = olddriver.update(); -// } + if (!ret) { + return false; + } - return ret; + return SyncTaskService.me.save(new SyncTask().addUpdateData(chkobj)) + && ModifyLogService.me.save(chkobj, old, Enums.DataOpType.UPDATE.getId(), tokenuser); } }); - return ret ? Result.object(model) : Result.failed(false, "编辑失败"); + + chkobj.remove("password"); // 更新用户信息，不更新密码 + + return ret ? Result.object(chkobj) : Result.failed(false, "编辑失败"); } catch (Exception e) { log.error(e.getMessage(), e); if (e.getMessage().contains("PRIMARY")) { @@ -341,17 +355,30 @@ public class SysuserService extends BaseService { * @param model * @return */ - public Result restore(BaseModel model) { + public Result restore(BaseModel model, Sysuser tokenuser) { try { if (!model.hasDelKey()) { return Result.failed(false, "不存在逻辑删除字段"); } - model.set(Const.LOGIC_DEL_KEY, Const.LOGIC_DEL_VALID); // 逻辑删除字段统一用 del - - boolean ret = model.update(); - Sysuser sysuser = Sysuser.dao.findById(model.get("id")); + Sysuser old = sysuser.clone(); + + sysuser.set(Const.LOGIC_DEL_KEY, Const.LOGIC_DEL_VALID); // 逻辑删除字段统一用 del + + boolean ret = Db.tx(new IAtom() { + @Override + public boolean run() throws SQLException { + boolean ret = sysuser.update(); + + if (!ret) { + return false; + } + + return SyncTaskService.me.save(new SyncTask().addUpdateData(sysuser)) + && ModifyLogService.me.save(sysuser, old, Enums.DataOpType.UPDATE.getId(), tokenuser); + } + }); sysuser.remove("password"); @@ -381,6 +408,12 @@ public class SysuserService extends BaseService { Sysuser sysuser = Sysuser.dao.findById(tokenuser.getId()); // 需要再从数据库中查询一次 + if (sysuser == null) { + return Result.failed(false, "修改失败"); + } + + Sysuser old = sysuser.clone(); + String oldmd5 = getPwdMD5(sysuser.getPhone(), oldpwd); if (!sysuser.getPassword().equals(oldmd5)) { @@ -391,7 +424,19 @@ public class SysuserService extends BaseService { sysuser.setPassword(newmd5); - boolean ret = sysuser.update(); + boolean ret = Db.tx(new IAtom() { + @Override + public boolean run() throws SQLException { + boolean ret = sysuser.update(); + + if (!ret) { + return false; + } + + return SyncTaskService.me.save(new SyncTask().addUpdateData(sysuser)) + && ModifyLogService.me.save(sysuser, old, Enums.DataOpType.UPDATE.getId(), tokenuser); + } + }); sysuser.remove("password"); @@ -407,10 +452,10 @@ public class SysuserService extends BaseService { * 重置密码 * * @param model 被修改的用户，只要id - * @param adminuser 验证当前用户是否是管理员 + * @param tokenuser 验证当前用户是否是管理员 * @return */ - public Result resetPassword(Sysuser model, Sysuser adminuser) { + public Result resetPassword(Sysuser model, Sysuser tokenuser) { try { // TODO 判断权限，若权限修改，这里也要调整 // if (adminuser == null @@ -425,9 +470,22 @@ public class SysuserService extends BaseService { return Result.failed(false, "重置失败"); } + Sysuser old = sysuser.clone(); sysuser.setPassword(getPwdMD5(sysuser.getPhone(), Const.DEFAULT_PASSWORD)); - boolean ret = sysuser.update(); + boolean ret = Db.tx(new IAtom() { + @Override + public boolean run() throws SQLException { + boolean ret = sysuser.update(); + + if (!ret) { + return false; + } + + return SyncTaskService.me.save(new SyncTask().addUpdateData(sysuser)) + && ModifyLogService.me.save(sysuser, old, Enums.DataOpType.UPDATE.getId(), tokenuser); + } + }); sysuser.remove("password"); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/transportcompany/TransportCompanyController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/transportcompany/TransportCompanyController.java index a052010..a23e3d0 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/transportcompany/TransportCompanyController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/transportcompany/TransportCompanyController.java @@ -4,7 +4,7 @@ import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.model.Sysuser; import com.cowr.model.TransportCompany; -import com.cowr.service.ssjygl.system.sysuser.SysuserService; +import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.ssjygl.transportcompany.TransportCompanyPKValidator; import com.cowr.ssjygl.transportcompany.TransportCompanyService; import com.cowr.ssjygl.transportcompany.TransportCompanyValidator; @@ -36,7 +36,7 @@ public class TransportCompanyController extends Controller { */ @Before(TransportCompanyValidator.class) public void save(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -52,7 +52,7 @@ public class TransportCompanyController extends Controller { */ @Before(TransportCompanyPKValidator.class) public void del(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -68,7 +68,7 @@ public class TransportCompanyController extends Controller { */ @Before(TransportCompanyPKValidator.class) public void restore(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -84,7 +84,7 @@ public class TransportCompanyController extends Controller { */ @Before(TransportCompanyValidator.class) public void edit(){ - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/truck/TruckController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/truck/TruckController.java index c103f56..a2bef6b 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/truck/TruckController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/truck/TruckController.java @@ -5,7 +5,7 @@ import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.model.Sysuser; import com.cowr.model.Truck; -import com.cowr.service.ssjygl.system.sysuser.SysuserService; +import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.ssjygl.truck.TruckPKValidator; import com.cowr.ssjygl.truck.TruckService; import com.cowr.ssjygl.truck.TruckValidator; @@ -36,7 +36,7 @@ public class TruckController extends BaseController { */ @Before(TruckValidator.class) public void save() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -52,7 +52,7 @@ public class TruckController extends BaseController { */ @Before(TruckPKValidator.class) public void del() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -68,7 +68,7 @@ public class TruckController extends BaseController { */ @Before(TruckPKValidator.class) public void restore() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); @@ -84,7 +84,7 @@ public class TruckController extends BaseController { */ @Before(TruckValidator.class) public void edit() { - Sysuser tokenuser = SysuserService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { renderJson(Result.noauth()); diff --git a/ssjygl-xsx-service/src/main/resources/dev/config.properties b/ssjygl-xsx-service/src/main/resources/dev/config.properties index 45153af..ff76f7e 100644 --- a/ssjygl-xsx-service/src/main/resources/dev/config.properties +++ b/ssjygl-xsx-service/src/main/resources/dev/config.properties @@ -1,12 +1,12 @@ devMode=true #打印用到的配置信息 -print.vendor=湖北 -print.vendorTaxId=9142 +print.vendor=浠水县长投环保有限公司 +print.vendorTaxId=91421125MA49GYYK2B #起步运输距离 start.trans.distance=5 #本地服务 和 云端服务 socket 通信 -socketserver.enable=false +socketserver.enable=true socketserver.port=21002 \ No newline at end of file diff --git a/ssjygl-xsx-service/src/main/resources/dev/db.properties b/ssjygl-xsx-service/src/main/resources/dev/db.properties index c183203..5c04e5c 100644 --- a/ssjygl-xsx-service/src/main/resources/dev/db.properties +++ b/ssjygl-xsx-service/src/main/resources/dev/db.properties @@ -1,5 +1,5 @@ # mysql -jdbcUrl=jdbc:mysql://rm-wz9wa070076b2uge2ro.mysql.rds.aliyuncs.com:3306/ssjy_xsx_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true +jdbcUrl=jdbc:mysql://rm-wz9wa070076b2uge2ro.mysql.rds.aliyuncs.com:3306/ssjy_xsx_service_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true user=ssjy_xsx password=Ssjy_xs_890 diff --git a/ssjygl-xsx-service/src/main/resources/job.properties b/ssjygl-xsx-service/src/main/resources/job.properties index 3cd4be1..f946ac4 100644 --- a/ssjygl-xsx-service/src/main/resources/job.properties +++ b/ssjygl-xsx-service/src/main/resources/job.properties @@ -2,4 +2,4 @@ #.job 部分前面不能以 job结尾 synctask.job=com.cowr.service.ssjygl.jobs.SyncJob synctask.cron= 0 * * * * ? -synctask.enable=false \ No newline at end of file +synctask.enable=true \ No newline at end of file diff --git a/ssjygl-xsx-service/src/main/resources/prod/config.properties b/ssjygl-xsx-service/src/main/resources/prod/config.properties index 1656e1a..ff76f7e 100644 --- a/ssjygl-xsx-service/src/main/resources/prod/config.properties +++ b/ssjygl-xsx-service/src/main/resources/prod/config.properties @@ -1,12 +1,12 @@ devMode=true #打印用到的配置信息 -print.vendor=湖北齐安坤源矿业有限公司 -print.vendorTaxId=91421100MA49BNY95J +print.vendor=浠水县长投环保有限公司 +print.vendorTaxId=91421125MA49GYYK2B #起步运输距离 start.trans.distance=5 #本地服务 和 云端服务 socket 通信 -socketserver.enable=false +socketserver.enable=true socketserver.port=21002 \ No newline at end of file diff --git a/ssjygl-xsx-service/src/main/resources/prod/db.properties b/ssjygl-xsx-service/src/main/resources/prod/db.properties index b3a90a3..f16b18d 100644 --- a/ssjygl-xsx-service/src/main/resources/prod/db.properties +++ b/ssjygl-xsx-service/src/main/resources/prod/db.properties @@ -1,5 +1,5 @@ # mysql -jdbcUrl=jdbc:mysql://rm-wz9wa070076b2uge2ro.mysql.rds.aliyuncs.com:3306/ssjy_xsx_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true +jdbcUrl=jdbc:mysql://rm-wz9wa070076b2uge2ro.mysql.rds.aliyuncs.com:3306/ssjy_xsx_service_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true user=ssjy_xsx password=Ssjy_xs_890 diff --git a/ssjygl-xsx-service/start.sh b/ssjygl-xsx-service/start.sh index 62bfba7..8d043fe 100644 --- a/ssjygl-xsx-service/start.sh +++ b/ssjygl-xsx-service/start.sh @@ -40,8 +40,7 @@ CP=${APP_BASE_PATH}/config:${APP_BASE_PATH}/lib/* # nohup java -Xverify:none ${JAVA_OPTS} -cp ${CP} ${MAIN_CLASS} > output.log & # 运行为非后台进程，多用于开发阶段，快捷键 ctrl + c 可停止服务 -/home/admin123456/hsjygl_hzq/jdk1.8.0_251/bin/java -Xverify:none ${JAVA_OPTS} -cp ${CP} ${MAIN_CLASS} -#java -Xverify:none ${JAVA_OPTS} -cp ${CP} ${MAIN_CLASS} +java -Xverify:none ${JAVA_OPTS} -cp ${CP} ${MAIN_CLASS}