照片修改代码提交

pom.xml

@@ -115,12 +115,12 @@
                 <version>5.7.20</version>
             </dependency>
 
-            <!--shiro-->
+<!--            &lt;!&ndash;shiro&ndash;&gt;-->
-            <dependency>
+<!--            <dependency>-->
-                <groupId>org.apache.shiro</groupId>
+<!--                <groupId>org.apache.shiro</groupId>-->
-                <artifactId>shiro-spring-boot-starter</artifactId>
+<!--                <artifactId>shiro-spring-boot-starter</artifactId>-->
-                <version>1.11.0</version>
+<!--                <version>1.11.0</version>-->
-            </dependency>
+<!--            </dependency>-->
 
 
             <!--JNA:调用本地dll-->

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TowerController.java

@@ -18,6 +18,10 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.shiro.authz.annotation.RequiresRoles;
+import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;

xymanager_common/pom.xml

@@ -103,6 +103,13 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
+<!--        &lt;!&ndash;shiro&ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>org.apache.shiro</groupId>-->
+<!--            <artifactId>shiro-spring-boot-starter</artifactId>-->
+<!--        </dependency>-->
+
+
 
     </dependencies>
 

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java

@@ -110,7 +110,6 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
                 if (item.getMediaType() == 0) {
                     photoBean.setPath(photoaddress + item.getPath());
                 } else {
-
                     photoBean.setPath(videoaddress + item.getPath());
                     if (item.getThumb() != null) {
                         photoBean.setThumb(videoaddress + item.getThumb());
@@ -316,17 +315,17 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
         PageUtils.SetPage(pageindex, pagesize);
 
         List<ChannelAndTermDto> list = terminalsDao.selectChannelAndTermList(CommonStatus.EFFECTIVE.value());
+        List<TerminalPhotosModel.PhotosBean> beans = new ArrayList<>();
 
+        if (!CollectionUtil.isEmpty(list)) {
             List<Integer> termidlist = new ArrayList<>();
             for (ChannelAndTermDto item : list) {
                 Integer termid = item.getTermid();
                 termidlist.add(termid);
             }
-
             List<Lines> lines = linesDao.selectLineByDyId(null, CommonStatus.EFFECTIVE.value());
 
             List<TermAndChannelLatestPhotoMapperDto> list2 = terminalPhotoDao.selectTermAndChannelLatestPhotoList(termidlist);
-        List<TerminalPhotosModel.PhotosBean> beans = new ArrayList<>();
             for (ChannelAndTermDto item : list) {
                 TerminalPhotosModel.PhotosBean photosBean = new TerminalPhotosModel.PhotosBean();
                 photosBean.setTermid(item.getTermid());
@@ -362,6 +361,8 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
                 }
                 beans.add(photosBean);
             }
+        }
+
         model.setList(beans);
         PageInfo pageData = PageUtils.getPageData(list);
         int currentpage = pageData.getPageNum();