[用户 PDf 排序] 修改了用户以及添加了单位排序map

dev-file/src/main/java/com/tykj/dev/device/file/util/JavaToPdfHtmlFreeMarker.java

@@ -201,7 +201,6 @@ public class JavaToPdfHtmlFreeMarker {
 
         try {
             String QRCode= ZXingUtil.encode(documents.getId());
-            System.out.println(QRCode);
             // 获取模板,并设置编码方式
             Template template = freemarkerCfg.getTemplate("bill.html");
             template.setEncoding("UTF-8");
@@ -235,7 +234,6 @@ public class JavaToPdfHtmlFreeMarker {
         return null;
     }
 
-
     public static String[] freeMarkerRender1(Documents documents,String htmlPath) {
         Writer out = new StringWriter();
         String [] strings=new String[100000];
@@ -456,6 +454,7 @@ public class JavaToPdfHtmlFreeMarker {
         Writer out = new StringWriter();
         List<String> listCont=new ArrayList<>();
         try {
+            String QRCode= ZXingUtil.encode(documents.getId());
             // 获取模板,并设置编码方式
             Template template = freemarkerCfg.getTemplate("bill.html");
             template.setEncoding("UTF-8");
@@ -469,7 +468,7 @@ public class JavaToPdfHtmlFreeMarker {
                     String htmlname=htmlPath+ UUID.randomUUID().toString()+".html";
                     // 合并数据模型与模板
                     FileWriter fileWriter = new FileWriter(new File(htmlname));
-                    template.process(toMap(documents,list1,MAP.get(i),page,count),fileWriter);
+                    template.process(toMap(documents,list1,MAP.get(i),page,count,QRCode),fileWriter);
                     out.flush();
                     listCont.add(htmlname);
                     page++;

dev-misc/src/main/java/com/tykj/dev/misc/utils/DeviceModelSort.java

@@ -18,18 +18,44 @@ import java.util.stream.Collectors;
 public class DeviceModelSort {
     public static Map<String,Integer> mapModelSort;
 
+    public static Map<String,Integer> mapUnitSort;
+
+
+    /**
+     * 列装型号排序方法
+     * @param modelList 需要排序的型号
+     * @return 排】序过后的型号列表
+     */
     public static List<String> modelToSort(List<String> modelList){
-        List<String> collect = modelList.stream().sorted(Comparator.comparing(DeviceModelSort::toSort)).collect(Collectors.toList());
-        return collect;
+        return modelList.stream().sorted(Comparator.comparing(DeviceModelSort::toModelSort)).collect(Collectors.toList());
     }
 
 
     /**
      * 获取型号对应的排序号
      * @param model 型号
-     * @return
+     * @return 排序号码
      */
-    private static Integer toSort(String model){
+    public static Integer toModelSort(String model){
         return mapModelSort.get(model);
     }
+
+    /**
+     * 单位排序排序方法
+     * @param unitList 需要排序的型号
+     * @return 排】序过后的型号列表
+     */
+    public static List<String> unitToSort(List<String> unitList){
+        return unitList.stream().sorted(Comparator.comparing(DeviceModelSort::toUnitSort)).collect(Collectors.toList());
+    }
+
+    /**
+     * 获取单位对应的排序号
+     * @param  unitName 单位名称
+     * @return 排序号码
+     */
+    public static Integer toUnitSort(String unitName){
+        return mapUnitSort.get(unitName);
+    }
+
 }

dev-user/src/main/java/com/tykj/dev/device/user/config/SecurityConfig.java

@@ -101,6 +101,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
     @Override
     public void configure(HttpSecurity httpSecurity) throws Exception {
+        httpSecurity.headers().frameOptions().disable();
         httpSecurity
                 .cors()
                 .and()
@@ -142,6 +143,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                 }), ConcurrentSessionFilter.class)
                 .addFilterAt(myFilter(), UsernamePasswordAuthenticationFilter.class)
                 .csrf().disable();
+//                .headers().frameOptions().disable();
 
     }
 

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/UnitsService.java

@@ -150,4 +150,6 @@ public interface UnitsService extends PublicService<Units> {
     List<Units> findSubordinateList(Integer unitsId);
 
     Units findNameUnit(UnitNameVo unitNameVo);
+
+    void addUnitSortMap();
 }

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UnitsServiceImpl.java

@@ -10,6 +10,7 @@ import com.tykj.dev.device.user.subject.entity.SecurityUser;
 import com.tykj.dev.device.user.subject.entity.Units;
 import com.tykj.dev.device.user.subject.service.UnitsService;
 import com.tykj.dev.misc.exception.ApiException;
+import com.tykj.dev.misc.utils.DeviceModelSort;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -351,6 +352,11 @@ public class UnitsServiceImpl implements UnitsService {
         return unitsDao.findByName(unitNameVo.getUnitName());
     }
 
+    @Override
+    public void addUnitSortMap() {
+       DeviceModelSort.mapUnitSort=unitsDao.findAll().stream().collect(Collectors.toMap(Units::getName,Units::getShowOrder));
+    }
+
 
     @Override
     public Units save(Units units) {

dev-user/src/main/java/com/tykj/dev/device/user/task/userRun.java

@@ -40,67 +40,9 @@ public class userRun implements CommandLineRunner {
 
     @Override
     public void run(String... args) throws Exception {
-
-        if (userService.findAll().size() == 0) {
-            Units units = Units.toDb();
-            units.setAreaId(1);
-            units = unitsService.save(units);
-            User user = User.toDb();
-            user.setUserId(1);
-            user.setUnitsId(units.getUnitId());
-            user.setName("省A岗");
-            user.setUsername("shena");
-            userService.save(user);
-
-            user = User.toDb();
-            user.setUserId(2);
-            user.setName("省B岗");
-            user.setUsername("shenb");
-            userService.save(user);
-
-            units = Units.toDb();
-            units.setName("市机要局");
-            units.setUnitDesc("市机要局");
-            units.setAreaId(2);
-            units = unitsService.save(units);
-            user = User.toDb();
-            user.setUserId(3);
-            user.setUnitsId(units.getUnitId());
-            user.setName("市A岗");
-            user.setUsername("shia");
-            userService.save(user);
-            user = User.toDb();
-            user.setUserId(4);
-            user.setName("市B岗");
-            user.setUsername("shib");
-            userService.save(user);
-
-            units = Units.toDb();
-            units.setName("区机要局");
-            units.setUnitDesc("区机要局");
-            units.setAreaId(3);
-            units = unitsService.save(units);
-            user = User.toDb();
-            user.setUserId(5);
-            user.setUnitsId(units.getUnitId());
-            user.setName("区A岗");
-            user.setUsername("qua");
-            userService.save(user);
-            user = User.toDb();
-            user.setUserId(6);
-            user.setName("区B岗");
-            user.setUsername("qub");
-            userService.save(user);
-
-            permissionsRun();
-            roleRun();
-            rolePerssionsRun();
-            userRoleRun();
-            log.info("用户模块模拟数据生成");
-        } else {
-//            userService.updateUserPass();
-            log.info("已有用户不新建");
-        }
+        log.info("[用户] 项目启动初始化单位排序map开始");
+        unitsService.addUnitSortMap();
+        log.info("[用户] 项目启动初始化单位排序map完成");
     }
 
     private void permissionsRun() {