bug fixed

src/main/java/cn/wisenergy/chnmuseum/party/mapper/AssetMapper.java

@@ -21,6 +21,10 @@ public interface AssetMapper extends BaseMapper<Asset> {
             "where a.ref_item_id = vc.id " +
             "and vc.video_content_cat_id = vcc.id " +
             "and vc.video_content_copyright_owner_id = co.id " +
+            "and vc.is_published = 1 and vc.is_deleted = 0 " +
+            "and co.is_deleted = 0 and vcc.is_deleted = 0 " +
+            "<![CDATA[and co.expire_date_start <= DATE_FORMAT(now(), '%Y-%m-%d') ]]>" +
+            "<![CDATA[and co.expire_date_end >= DATE_FORMAT(now(), '%Y-%m-%d') ]]>" +
             "<if test='videoContentCatId != null'>and vcc.id = #{videoContentCatId} </if>" +
             "<if test='videoContentCopyrightOwnerId != null'>and co.id = #{videoContentCopyrightOwnerId} </if>" +
             "order by a.create_time desc" +

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/CopyrightOwnerController.java

@@ -119,6 +119,7 @@ public class CopyrightOwnerController extends BaseController {
     public Map<String, Object> updateCopyrightOwner(@Validated(value = {Update.class}) CopyrightOwner copyrightOwner) {
         final LambdaQueryWrapper<CopyrightOwner> lambdaQueryWrapper = Wrappers.<CopyrightOwner>lambdaQuery().eq(CopyrightOwner::getName, copyrightOwner.getName().trim());
         lambdaQueryWrapper.eq(CopyrightOwner::getOwnerType, copyrightOwner.getOwnerType().trim());
+        lambdaQueryWrapper.ne(CopyrightOwner::getId, copyrightOwner.getId());
         final int count = this.copyrightOwnerService.count(lambdaQueryWrapper);
         if (count > 0) {
             return getFailResult("400", "名称已存在，请修改名称");

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/LoginController.java

@@ -16,6 +16,8 @@ import cn.wisenergy.chnmuseum.party.service.impl.TUserServiceImpl;
 import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -261,6 +263,36 @@ public class LoginController extends BaseController {
         }
     }
 
+    @ApiOperation(value = "H5/PAD登录二维码", notes = "H5/PAD登录二维码", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "clientType", value = "客户端类型", dataType = "String", paramType = "query", allowableValues = "PAD, H5"),
+            @ApiImplicitParam(name = "width", value = "二维码宽度", dataType = "int", paramType = "query"),
+            @ApiImplicitParam(name = "height", value = "二维码高度", dataType = "int", paramType = "query")
+    })
+    @GetMapping(value = "loginByQrCode")
+    public ResponseEntity<byte[]> loginByQrCode(
+            @RequestParam(value = "clientType") String clientType,
+            @RequestParam(value = "width", required = false, defaultValue = "150") int width,
+            @RequestParam(value = "height", required = false, defaultValue = "150") int height,
+            HttpServletRequest request) {
+        String regUrl;
+        if ("H5".equalsIgnoreCase(clientType)) {
+            regUrl = request.getScheme() + "://" + request.getServerName() + ":8088/h5/login";
+        } else {
+            regUrl = request.getScheme() + "://" + request.getServerName() + ":8088/plat/#/login";
+        }
+        QrConfig config = new QrConfig(width, height);
+        config.setCharset(StandardCharsets.UTF_8);
+        config.setMargin(1);
+        config.setWidth(width);
+        config.setHeight(height);
+        final byte[] bytes = QrCodeUtil.generatePng(regUrl, config);
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.IMAGE_PNG);
+        headers.setContentLength(bytes.length);
+        return new ResponseEntity<>(bytes, headers, HttpStatus.OK);
+    }
+
     @RequestMapping(value = {"/verifyCode1"}, method = {RequestMethod.GET}, produces = MediaType.IMAGE_JPEG_VALUE)
     public @ResponseBody
     byte[] verifyCode1(HttpServletRequest request, HttpServletResponse response, Integer width, Integer height) {
@@ -298,22 +330,4 @@ public class LoginController extends BaseController {
         return null;
     }
 
-    @ApiOperation(value = "H5/PAD登录二维码", notes = "H5/PAD登录二维码", httpMethod = "GET")
-    @GetMapping(value = "loginByQrCode")
-    public ResponseEntity<byte[]> loginByQrCode(@RequestParam(value = "width", required = false, defaultValue = "150") int width,
-                                                @RequestParam(value = "height", required = false, defaultValue = "150") int height,
-                                                HttpServletRequest request) {
-        String regFullUrl = request.getScheme() + "://" + request.getServerName() + ":8088/h5/login";
-        QrConfig config = new QrConfig(width, height);
-        config.setCharset(StandardCharsets.UTF_8);
-        config.setMargin(1);
-        config.setWidth(width);
-        config.setHeight(height);
-        final byte[] bytes = QrCodeUtil.generatePng(regFullUrl, config);
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.IMAGE_PNG);
-        headers.setContentLength(bytes.length);
-        return new ResponseEntity<>(bytes, headers, HttpStatus.OK);
-    }
-
 }