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

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinMemberAuditController.java

@@ -33,7 +33,7 @@ public class KylinMemberAuditController extends BaseController {
     @Autowired
     private IKylinPerformancesAdminService kylinPerformancesService;
 
-    @RequiresPermissions("kylin:performances:memberAudit")
+    //@RequiresPermissions("kylin:performances:member")
     @GetMapping()
     public String memberAudit() {
         return prefix + "/memberAudit";
@@ -42,7 +42,7 @@ public class KylinMemberAuditController extends BaseController {
     /**
      * 会员待审核列表
      */
-    @RequiresPermissions("kylin:performances:recommend:list")
+    //@RequiresPermissions("kylin:performances:member")
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(@RequestParam("title") String title, @RequestParam("pageNum") int page, @RequestParam("pageSize") int size) {
@@ -51,7 +51,7 @@ public class KylinMemberAuditController extends BaseController {
         return getDataTable(result);
     }
 
-    @RequiresPermissions("kylin:performances:memberAudit:edit")
+    //@RequiresPermissions("kylin:performances:member")
     @GetMapping("/edit/{performancesId}")
     public String edit(@PathVariable("performancesId") String performancesId, Integer status, ModelMap mmap) {
         PerformanceMemberAuditDao result = kylinPerformancesService.performanceMemberAuditInfo(performancesId, status);
@@ -59,7 +59,7 @@ public class KylinMemberAuditController extends BaseController {
         return prefix + "/edit";
     }
 
-    @RequiresPermissions("kylin:performances:memberAudit:save")
+    //@RequiresPermissions("kylin:performances:member")
     @PostMapping("/save")
     @ResponseBody
     public AjaxResult save(@RequestParam("performancesId") String performancesId, @RequestParam("status")Integer status, @RequestParam("rejectTxt")String rejectTxt) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesController.java

@@ -48,7 +48,7 @@ public class KylinPerformancesController extends BaseController {
     @Autowired
     private DamaiService damaiService;
 
-    @RequiresPermissions("kylin:performances:view")
+    //@RequiresPermissions("kylin:performances:view")
     @GetMapping()
     public String performances() {
         return prefix + "/performances";
@@ -57,7 +57,7 @@ public class KylinPerformancesController extends BaseController {
     /**
      * 查询演出列表
      */
-    @RequiresPermissions("kylin:performances:list")
+    //@RequiresPermissions("kylin:performances:view")
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(PerformanceAdminListParam performanceAdminListParam) {
@@ -69,7 +69,7 @@ public class KylinPerformancesController extends BaseController {
         return rspData;
     }
 
-    @RequiresPermissions("kylin:performances:detail")
+    //@RequiresPermissions("kylin:performances:view")
     @GetMapping(value = "/details/{performancesId}")
     public String performanceDetails(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
         KylinPerformanceMisVo result = null;
@@ -79,21 +79,21 @@ public class KylinPerformancesController extends BaseController {
     }
 
     @PostMapping(value = "/audit")
-    @RequiresPermissions("kylin:performances:audit")
+    //@RequiresPermissions("kylin:performances:view")
     @ResponseBody
     public AjaxResult performanceAudit(@RequestParam("performancesId") String performancesId, @RequestParam("status") int status, @RequestParam(value = "rejectTxt", required = false) String rejectTxt) {
         boolean result = kylinPerformancesService.performanceAudit(performancesId, status, rejectTxt);
         return toAjax(result);
     }
 
-    @RequiresPermissions("kylin:performances:change")
+    //@RequiresPermissions("kylin:performances:view")
     @PostMapping(value = "/isShow")
     @ResponseBody
     public AjaxResult setIsShow(String performancesId, Integer isShow) {
         return toAjax(kylinPerformancesService.setIsShow(performancesId, isShow));
     }
 
-    @RequiresPermissions("kylin:performances:member")
+    //@RequiresPermissions("kylin:performances:view")
     @GetMapping(value = "/memberInfo/{performancesId}")
     public String memberInfo(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
         PerformanceMemberAuditDao result = kylinPerformancesService.performanceMemberInfo(performancesId);
@@ -101,7 +101,7 @@ public class KylinPerformancesController extends BaseController {
         return prefix + "/memberInfo";
     }
 
-    @RequiresPermissions("kylin:performances:member:change")
+    //@RequiresPermissions("kylin:performances:view")
     @PostMapping(value = "/memberInfo/submit")
     @ResponseBody
     public AjaxResult memberInfo(PerformanceMemberAuditParam performanceMemberAuditParam) {
@@ -109,7 +109,7 @@ public class KylinPerformancesController extends BaseController {
         return toAjax(result);
     }
 
-    @RequiresPermissions("kylin:performances:performanceStatic")
+    //@RequiresPermissions("kylin:performances:view")
     @GetMapping(value = "/performanceStatic/{performancesId}")
     public String performanceStatic(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
         //获取演出详情
@@ -136,7 +136,7 @@ public class KylinPerformancesController extends BaseController {
         return prefix + "/performancesStatic";
     }
 
-    @RequiresPermissions("kylin:performances:damai")
+    //@RequiresPermissions("kylin:performances:view")
     @GetMapping(value = "/damai/{performancesId}")
     public String damai(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
         KylinPerformanceDamaiVo result = kylinPerformancesService.getPerformanceDamai(performancesId);
@@ -144,7 +144,7 @@ public class KylinPerformancesController extends BaseController {
         return prefix + "/damai";
     }
 
-    @RequiresPermissions("kylin:performances:agent")
+    //@RequiresPermissions("kylin:performances:view")
     @GetMapping(value = "/agent/{performancesId}")
     public String agent(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
         KylinPerformanceAgentVo result = kylinPerformancesService.getPerformanceAgent(performancesId);
@@ -152,7 +152,7 @@ public class KylinPerformancesController extends BaseController {
         return prefix + "/agent";
     }
 
-    @RequiresPermissions("kylin:performances:agent")
+    //@RequiresPermissions("kylin:performances:view")
     @PostMapping(value = "/agent/change")
     @ResponseBody
     public AjaxResult changeTicketAgent(@RequestParam("performancesId") String performancesId, @RequestParam("ticketsId") String ticketsId, @RequestParam("status") Integer status) {
@@ -160,7 +160,7 @@ public class KylinPerformancesController extends BaseController {
         return toAjax(result);
     }
 
-    @RequiresPermissions("kylin:performances:damai")
+    //@RequiresPermissions("kylin:performances:view")
     @PostMapping(value = "/damai/change")
     @ResponseBody
     public AjaxResult changeSysDamai(@RequestParam("params") String params) {
@@ -170,7 +170,7 @@ public class KylinPerformancesController extends BaseController {
         return toAjax(result);
     }
 
-    @RequiresPermissions("kylin:performances:damai")
+    //@RequiresPermissions("kylin:performances:view")
     @PostMapping(value = "/sync/damai")
     @ResponseBody
     public AjaxResult syncDamai(@RequestParam("performancesId") String performancesId) {
@@ -178,7 +178,7 @@ public class KylinPerformancesController extends BaseController {
         return toAjax(result);
     }
 
-    @RequiresPermissions("kylin:performances:refundConfig")
+    //@RequiresPermissions("kylin:performances:view")
     @GetMapping(value = "/refundConfig/{performancesId}")
     public String getRefundConfig(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
         PerformanceRefundConfigVo result = kylinPerformancesService.getRefundConfig(performancesId);
@@ -186,7 +186,7 @@ public class KylinPerformancesController extends BaseController {
         return prefix + "/refundConfig";
     }
 
-    @RequiresPermissions("kylin:performances:refundConfig")
+    //@RequiresPermissions("kylin:performances:view")
     @PostMapping(value = "/refundConfig/change")
     @ResponseBody
     public AjaxResult changeRefundConfig(@RequestParam("performancesId") String performancesId,

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesRecommendController.java

@@ -36,7 +36,7 @@ public class KylinPerformancesRecommendController extends BaseController {
     @Autowired
     private IKylinPerformancesAdminService kylinPerformancesService;
 
-    @RequiresPermissions("kylin:performances:recommend")
+//    @RequiresPermissions("kylin:performances:recommend")
     @GetMapping()
     public String recommend() {
         return prefix + "/recommend";
@@ -45,7 +45,7 @@ public class KylinPerformancesRecommendController extends BaseController {
     /**
      * 查询演出列表
      */
-    @RequiresPermissions("kylin:performances:recommend:list")
+//    @RequiresPermissions("kylin:performances:recommend:list")
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list() {
@@ -64,7 +64,7 @@ public class KylinPerformancesRecommendController extends BaseController {
     /**
      * 修改
      */
-    @RequiresPermissions("kylin:performances:recommend:change")
+//    @RequiresPermissions("kylin:performances:recommend:change")
     @PostMapping("/change")
     @ResponseBody
     public AjaxResult setRecommend(@RequestParam(value = "ids") String performancesId,@RequestParam(value = "isRecommend",required = false) Integer isRecommend) {
@@ -82,7 +82,7 @@ public class KylinPerformancesRecommendController extends BaseController {
         return prefix + "/edit";
     }
 
-    @RequiresPermissions("kylin:performances:recommend:change")
+//    @RequiresPermissions("kylin:performances:recommend:change")
     @GetMapping(value = "/performance/status")
     @ResponseBody
     public AjaxResult listByStatus(@RequestParam(value = "status") String status,@RequestParam(value = "title",required = false) String title) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinRoadShowController.java

@@ -41,13 +41,13 @@ public class KylinRoadShowController extends BaseController {
     @Autowired
     private IKylinPerformancesAdminService kylinPerformancesService;
 
-    @RequiresPermissions("kylin:performances:roadShow")
+//    @RequiresPermissions("kylin:performances:roadShow")
     @GetMapping()
     public String roadShow() {
         return prefix + "/roadShow";
     }
 
-    @RequiresPermissions("kylin:performances:roadShow:list")
+//    @RequiresPermissions("kylin:performances:roadShow:list")
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo listRoadShow(@RequestParam(value = "title", required = false) String title,
@@ -66,7 +66,7 @@ public class KylinRoadShowController extends BaseController {
         return prefix + "/add";
     }
 
-    @RequiresPermissions("kylin:performances:roadShow:add")
+//    @RequiresPermissions("kylin:performances:roadShow:add")
     @Log(title = "巡演", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
@@ -74,7 +74,7 @@ public class KylinRoadShowController extends BaseController {
         return toAjax(!kylinRoadShowsAdminService.createRoadShow(createRoadShowParam).equals(""));
     }
 
-    @RequiresPermissions("kylin:performances:roadShow:details")
+//    @RequiresPermissions("kylin:performances:roadShow:details")
     @GetMapping(value = "/details/{roadShowId}")
     public String detailsRoadShow(@PathVariable("roadShowId") String roadShowId, ModelMap mmap) {
         KylinRoadShowAdminVo result = kylinRoadShowsAdminService.detailsRoadShow(roadShowId);
@@ -82,7 +82,7 @@ public class KylinRoadShowController extends BaseController {
         return prefix + "/edit";
     }
 
-    @RequiresPermissions("kylin:performances:roadShow:edit")
+//    @RequiresPermissions("kylin:performances:roadShow:edit")
     @Log(title = "巡演", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
@@ -100,7 +100,7 @@ public class KylinRoadShowController extends BaseController {
         return prefix + "/details";
     }
 
-    @RequiresPermissions("kylin:performances:roadShow:addPerformance")
+//    @RequiresPermissions("kylin:performances:roadShow:addPerformance")
     @GetMapping(value = "/performance/{roadShowId}")
     @ResponseBody
     public TableDataInfo listByRoadShowId(@PathVariable("roadShowId") String roadShowId) {
@@ -109,7 +109,7 @@ public class KylinRoadShowController extends BaseController {
     }
 
 
-    @RequiresPermissions("kylin:performances:roadShow:change:performance")
+//    @RequiresPermissions("kylin:performances:roadShow:change:performance")
     @PostMapping(value = "/roadShow/relation")
     @ResponseBody
     public AjaxResult changeRoadShowId(@RequestParam(value = "ids") String performancesId,@RequestParam(value = "roadShowId",required = false) String roadShowId) {
@@ -126,7 +126,7 @@ public class KylinRoadShowController extends BaseController {
         return prefix + "/addPerformances";
     }
 
-    @RequiresPermissions("kylin:performances:roadShow:change:performance")
+//    @RequiresPermissions("kylin:performances:roadShow:change:performance")
     @GetMapping(value = "/performance/status")
     @ResponseBody
     public AjaxResult listByStatus(@RequestParam(value = "status") String status,@RequestParam(value = "title",required = false) String title) {

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/docu/db_ln_adam_initialdata.sql

@@ -133,7 +133,7 @@ create table adam_addresses
     province     varchar(60)                    not null comment '省份',
     city         varchar(60)                    not null comment '城市',
     county       varchar(60)                    not null comment '区县',
-    address      tinytext                       not null comment '详细地址',
+    address      text                       not null comment '详细地址',
     is_default   boolean                        not null default false comment '是否为默认:0-否,1-是,第一个默认1',
     state        tinyint                        not null comment '状态:0-INIT,1-NORMAL,2-INVALID',
     created_at   datetime(3)                    not null,

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/partner/KylinCheckUserPartnerController.java

@@ -52,13 +52,13 @@ public class KylinCheckUserPartnerController {
         return checkUserPartnerService.del(merchantId, checkUserId);
     }
 
-    @PutMapping(value = "")
+    @PostMapping(value = "change")
     @ApiOperation(value = "修改验票账号", position = 1)
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<String> change(@RequestParam("merchantId") @NotNull String merchantId,
                                       @RequestParam("checkUserId") @NotNull String checkUserId,
                                       @RequestParam("name") @NotNull String name,
-                                      @RequestParam(value = "pwd",required = false) @NotNull String pwd,
+                                      @RequestParam(value = "pwd",required = false) String pwd,
                                       @RequestParam("mobile") @Length(max = 11) String mobile) {
         return checkUserPartnerService.change(merchantId, checkUserId, name, pwd, mobile);
     }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMEntersProcessor.java

@@ -35,8 +35,8 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
 //            log.info("DM.flush.AdamEntersVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamEntersVo.class.getSimpleName()).getDeletedCount());
         }
 
-        String sqlCount = "select count(1) from (\n" +
-                "                  select row_number() over (partition by user_id,type,idcode,name order by updated_at desc) rn,e.* from enters e where e.is_certification = 'yes' and e.deleted_at is null and created_at" + (StringUtils.isBlank(incrDt) ? "<curdate()" : (">=curdate()-" + incrDt)) + "\n" +
+        String sqlCount = "select count(1) from (" +
+                "                  select row_number() over (partition by user_id,type,idcode,name order by updated_at desc) rn,e.* from enters e where e.is_certification = 'yes' and e.deleted_at is null and created_at" + (StringUtils.isBlank(incrDt) ? "<curdate()" : (">=curdate()-" + incrDt)) +
                 "                  ) tk where tk.rn=1 ";
         if (null != dg) {
             sqlCount = sqlCount + " and id%" + dG + "=" + dg;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMThirdPartsProcessor.java

@@ -37,8 +37,8 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
 //            log.info("DM.flush.AdamThirdPartInfoVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamThirdPartInfoVo.class.getSimpleName()).getDeletedCount());
         }
 
-        String sqlCount = "select count(1) from (\n" +
-                "                         select row_number() over (partition by uid,type order by created_at desc) rn,id,uid,open_id,avatar,nickname,type,created_at,updated_at from user_third_parts where `status`=1 and delete_tag in (0,1) and open_id<>'' and uid>0 and created_at" + (StringUtils.isBlank(incrDt) ? "<curdate()" : (">=curdate()-" + incrDt)) + "\n" +
+        String sqlCount = "select count(1) from (" +
+                "                         select row_number() over (partition by uid,type order by created_at desc) rn,id,uid,open_id,avatar,nickname,type,created_at,updated_at from user_third_parts where `status`=1 and delete_tag in (0,1) and open_id<>'' and uid>0 and created_at" + (StringUtils.isBlank(incrDt) ? "<curdate()" : (">=curdate()-" + incrDt)) +
                 "                     ) t where t.rn=1";
         if (null != dg) {
             sqlCount = sqlCount + " and id%" + dG + "=" + dg;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMUserInformationProcessor.java

@@ -75,7 +75,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
         ResultSetImpl row = null;
         try {
             Class.forName(DB_DRIVER);
-//            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
+            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
             statement = connection.prepareStatement(sqlCount);
             row = (ResultSetImpl) statement.executeQuery();
             row.first();