base存档

tofly-auth/src/main/java/com/tofly/auth/controller/OauthController.java

@@ -46,8 +46,9 @@ public class OauthController {
     })
     @ToFlyAppLog(title = "登录", type = CommonConstants.LOG_LOGIN)
     public ResultRespone postAccessToken(@ApiParam(hidden = true) Principal principal, @ApiParam(hidden = true) @RequestParam Map<String, String> parameters) throws HttpRequestMethodNotSupportedException {
+
         String isweb = parameters.get("isweb");
-        String username = parameters.get("username");
+        String username = parameters.get("username").replaceAll("_ms","");
         if (StringUtils.isEmpty(isweb)) {
             parameters.put("username", username+"_ms");
         }

tofly-base/base-service/src/main/java/com/tofly/base/controller/ProjectinfoController.java

@@ -81,8 +81,7 @@ public class ProjectinfoController {
     @GetMapping("/get" )
     @ApiOperation(value = "查询基本信息")
     public ResultRespone get(@ModelAttribute Projectinfo projectinfo) {
-        log.info("----------"+SecurityUtils.getCompanyId()+"2222"+SecurityUtils.compareCompany(projectinfo.getCompanyId()));
-        Long companyId = commonOauthService.compareCompany(projectinfo.getCompanyId());
+        Long companyId = SecurityUtils.compareCompany(projectinfo.getCompanyId());
         projectinfo.setCompanyId(companyId);
         return ResultRespone.success(projectinfoService.getOne(Wrappers.query(projectinfo),false));
     }
@@ -131,6 +130,9 @@ public class ProjectinfoController {
 //        }
         Long companyId = commonOauthService.compareCompany(projectinfo.getCompanyId());
         projectinfo.setCompanyId(companyId);
+        Projectinfo p = projectinfoService.getOne(Wrappers.<Projectinfo>lambdaQuery()
+                .eq(Projectinfo::getCompanyId,projectinfo.getCompanyId()));
+        projectinfo.setId(p.getId());
         if(file!=null){
             String filename = logoPath+ IdWorker.getIdStr()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
             boolean b= FtpUtil.uploadFile2Ftp(file,filename);
@@ -146,7 +148,7 @@ public class ProjectinfoController {
                 return ResultRespone.failed("上传到FTP失败");
             }
         }
-      return ResultRespone.success(projectinfoService.saveOrUpdate(projectinfo));
+      return ResultRespone.success(projectinfoService.updateById(projectinfo));
     }
 
     private boolean checkAuth(){

tofly-base/base-service/src/main/java/com/tofly/base/controller/UserController.java

@@ -128,6 +128,7 @@ public class UserController {
     public ResultRespone save(MultipartFile file, User user, HttpServletRequest request) {
         User quser=userService.getOne(Wrappers.<User>lambdaQuery()
         .eq(User::getUsername,user.getUsername()));
+        user.setCompanyId(SecurityUtils.getCompanyId());
         if(quser!=null){
             return ResultRespone.failed("该用户名【"+user.getUsername()+"】已经存在，不能新增");
         }
@@ -409,6 +410,55 @@ public class UserController {
         return ResultRespone.success(userService.getSourceByUser());
     }
 
+    @GetMapping("/gisToken" )
+    @ApiOperation(value = "获取用户资源列表")
+    public ResultRespone gisToken() {
+        Long userId=SecurityUtils.getUserId();
+        Long deptId=SecurityUtils.getUserDeptId();
+
+        //资源列表
+        List<Map> gisResources=sourceService.listSources(deptId);
+        //List gisList=new ArrayList();
+        List<Map> gisList=new ArrayList();
+        List<Map> sourList;
+        String encodeStr = null;
+        for (Map m:gisResources){
+            List<Source> sourceList=sourceService.list(Wrappers.<Source>lambdaQuery()
+                    .eq(Source::getPid,m.get("id"))
+                    .apply("exists (select 1\n" +
+                            "          from  tf_smpn_departmentsource_x\n" +
+                            "         where tf_smpn_departmentsource_x.source_id = tf_smpn_source_x.id\n" +
+                            "          and tf_smpn_departmentsource_x.department_id={0})",deptId)
+            );
+            sourList=new ArrayList();
+            for(Source source:sourceList){
+                Map sourcemap=new HashMap();
+                sourcemap.put("key",source.getCkey());
+                sourcemap.put("groupname",m.get("GROUPNAME"));
+                sourcemap.put("name",source.getName());
+                sourcemap.put("url",source.getCval());
+                sourList.add(sourcemap);
+            };
+            m.put("config",sourList);
+            if("dbconnection".equals(m.get("code"))){
+                String gisDb =  sourList.get(0).get("url").toString();
+                User user = userService.getById(SecurityUtils.getUserId());
+                GisToken gisToken = new GisToken();
+                gisToken.setUserId(user.getId());
+                gisToken.setUserName(user.getUsername());
+                gisToken.setRealName(user.getRealName());
+                gisToken.setConnectstr(gisDb);
+                Object obj = JSONArray.toJSON(gisToken);
+                byte[] base64=Base64.encodeBase64(obj.toString().getBytes());
+                String base64Str=new String(base64);
+                encodeStr = base64Str;
+            }
+        };
+        Map returnMap=new HashMap();
+        returnMap.put("gisToken",encodeStr);
+        return ResultRespone.success(returnMap);
+    }
+
     @GetMapping("/initData" )
     @ApiOperation(value = "初始化获取用户所有资源")
     @SneakyThrows
@@ -650,7 +700,7 @@ public class UserController {
         }
         List<Map<String,Object>> deptlist =  departmentService.listMaps(Wrappers.<Department>lambdaQuery()
                 .in(deptIds.size() > 0,Department::getId,deptIds)
-                .select(Department::getId,Department::getName));
+                .select(Department::getId,Department::getName).eq(Department::getCompanyId,SecurityUtils.getCompanyId()));
         deptlist.forEach(dept->{
             List userList = userService.listMaps(Wrappers.<User>lambdaQuery()
                     .eq(User::getDepartmentId,dept.get("id"))
@@ -676,6 +726,7 @@ public class UserController {
             departmentIds = Arrays.asList(departmentId.split(","));
         }
         return ResultRespone.success(userService.pageMaps(page, Wrappers.<User>lambdaQuery()
+                .eq(User::getCompanyId,SecurityUtils.getCompanyId())
                 .in(deptIds.size() > 0,User::getDepartmentId,deptIds)
                 .in(departmentIds.size() > 0,User::getDepartmentId,departmentIds)
                 .select(User::getId,User::getRealName)));

tofly-base/base-service/src/main/java/com/tofly/base/entity/Role.java

@@ -89,6 +89,7 @@ public class Role extends Model<Role> {
      */
     @ApiModelProperty(value = "公司ID")
     private Long companyId;
+
     @TableField(exist = false)
     private String companyName;
     

tofly-base/base-service/src/main/java/com/tofly/base/service/FeignDyrqService.java

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.Map;
 
-@FeignClient(contextId = "dyrqService",value = "tofly-dyrq")
+@FeignClient(contextId = "dyrqService",value = "tofly-zmrq")
 public interface FeignDyrqService {
     @GetMapping("/pdauserdevice/page")
     ResultRespone getPdaUserdevice(@RequestParam Map param);

tofly-base/base-service/src/main/java/com/tofly/base/service/impl/UserServiceImpl.java

@@ -225,6 +225,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
         listUser.stream().forEach(user -> {
             user.setPassword(PasswordUtil.passwordEncode(DigestUtils.sha1Hex(user.getPassword())));
+            user.setCompanyId(SecurityUtils.getCompanyId());
             this.save(user);
         });
 

tofly-base/base-service/src/main/resources/mapper/RoleMapper.xml

@@ -14,9 +14,15 @@
         <result property="portaluserId" column="PORTALUSER_ID"/>
         <result property="createUser" column="CREATE_USER"/>
         <result property="companyId" column="COMPANY_ID"/>
-        <association property="companyName" column="COMPANY_ID"
-                     select="com.tofly.common.mapper.ToflyCodeCommonMapper.getCompanyName"></association>
+        <association property="companyName" column="COMPANY_ID"  select="com.tofly.common.mapper.ToflyCodeCommonMapper.getCompanyName"></association>
     </resultMap>
+
+    <select id="rolePageNew" resultType="java.util.Map">
+        select t.*,c.name as company_name from TF_SMPN_ROLE_X t
+            left join Tf_Smpn_Company_x c on c.id = t.company_id where t.company_id = #{role.companyId}
+    </select>
+
+
     <select id="listMenuByRoleId" parameterType="map" resultType="map" databaseId="oracle">
         select m.*,
                decode((select 1
@@ -39,7 +45,7 @@
                      where m.id = rm.menu_id
                        and rm.role_id = #{roleId,jdbcType=NUMERIC})
                    when 1 then 'true'
-                   else 'false' end is_exists
+                   else 'false' end is_exists`
         from tf_smpn_menu_x m
         where sys_id = #{systemId}
         order by sort

tofly-base/base-service/src/main/resources/mapper/UserRoleMapper.xml

@@ -2,10 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.tofly.base.mapper.UserRoleMapper">
-
-  <resultMap id="userRoleMap" type="com.tofly.base.entity.UserRole">
-                                      <id property="id" column="ID"/>
-                            <result property="userId" column="USER_ID"/>
-                        <result property="roleId" column="ROLE_ID"/>
-                      </resultMap>
+    <resultMap id="userRoleMap" type="com.tofly.base.entity.UserRole">
+        <id property="id" column="ID"/>
+        <result property="userId" column="USER_ID"/>
+        <result property="roleId" column="ROLE_ID"/>
+    </resultMap>
 </mapper>

tofly-common/common-core/src/main/java/com/tofly/common/core/util/FtpUtil.java

@@ -249,6 +249,8 @@ public class FtpUtil {
         Assert.hasText(remoteFilePath, "remoteFilePath cannot be null or blank.");
         FTPClient ftpClient = getFtpClient();
         try (OutputStream out = ftpClient.storeFileStream(encodingPath(remoteFilePath))) {
+            System.out.println("out"+out.toString());
+            System.out.println("bytes"+bytes.toString());
             out.write(bytes);
             out.close();
             ftpClient.completePendingCommand();

tofly-common/common-oauth/src/main/java/com/tofly/common/oauth/config/MybatisPlusConfigurer.java

@@ -37,8 +37,8 @@ public class MybatisPlusConfigurer {
     @Bean
     public PaginationInterceptor paginationInterceptor() {
         PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
-        paginationInterceptor.setLimit(1000);
-
+//        paginationInterceptor.setLimit(1000);
+        paginationInterceptor.setLimit(-1);
         //增加mysql的关键字处理
         String datatype=toflyDataTypeConstant.getDataType();
         switch (datatype){

tofly-common/common-oauth/src/main/java/com/tofly/common/oauth/config/ToflyAuthenticationProvider.java

@@ -63,7 +63,7 @@ public class ToflyAuthenticationProvider implements AuthenticationProvider {
         }
         //除掉用户名中的判断是否移动端登录的部分
 //        String username=StringUtil.remove(username1,"_ifyd");
-        String username=username1.replace("_ms","");
+        String username=username1.replaceAll("_ms","");
         // 进行密码的比对
         // 获取封装用户信息的对象
         UserDetails userDetails = userDetailService.loadUserByUsername(username);